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

fengxiang

2018-03-05 42ac7e8242e0e6fa51816449f4d73f5e80114b9a

src/assets/.gitkeep does not exist in tree 263b6396f9196bcff7e702cb4c77e055ee6ca39b