Merge branch 'master' into Develop

pansen

2019-01-04 a9e9e90b0c0a8fa7f0b78b29101a3dc13a021a5d

 .gitignore

@@ -19,3 +19,7 @@
*.exe
*.out
*.app

QiaoJiaSystem/\.idea/

QiaoJiaSystem/cmake-build-debug/