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

fengxiang

2018-03-16 bd1966ac64e93a610a4635c3eefd5115ab825c5b

 .gitignore

@@ -37,3 +37,7 @@
.DS_Store
Thumbs.db
.angulardoc.json
yarn.lock
/_nginx/*
.github/*