Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

xufenglei

2018-01-05 930adc902c0d0a81b685e7d3f0443df50cb608a0

 .gitignore

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

generatorConfig.xml