8 commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	bt1/backb-t1/WebContent/js/1.js