Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-03-08 43f2601b8a5706a029f333204f7f52f153d61dfe

 .gitignore

@@ -38,4 +38,6 @@
Thumbs.db
.angulardoc.json
yarn.lock
/_nginx/*
.github/*