merge
Merge branch 'master' of ssh://git@github.com/teamaccount/MMS.git

Conflicts:
	SopraMMS/WebContent/js/inputmanager.js