Merge branch 'master' into develop

.gitignore

+HTML
+*.bat
+*.mat
+*.pdf
+*.dll
+*.exe
+*.so*
+Thumbs.db
+.DS_Store
+*.asv
+*.wav
+*.xlsx
+*.docx
+*.dll
+*.csv
+*.h5
+*.ita
+*.fig
+*.png
+*.jpeg
+*.sofa
+*.spk
+*.unv
+*.stl
+svnaccess
+*.lib
+*.exp