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

fengxiang

2018-01-16 09e95982e57f1a26be4249d11091a935544df684

 .gitignore

@@ -19,10 +19,6 @@

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
@@ -40,3 +36,8 @@
# System Files
.DS_Store
Thumbs.db
.angulardoc.json
yarn.lock
/_nginx/*
.github/*