Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-22 35c9751e86237dd20b8f23ef21f2b9daab97cee1

 .gitignore

@@ -21,4 +21,6 @@
nbbuild/
dist/
nbdist/
.nb-gradle/
.nb-gradle/

generatorConfig.xml