Master have some changes like fix some bugs
Merge branch 'master' of https://github.com/dragonsoft-cara/TestGit

Conflicts:
	static/matrixToolBar.js
Test1