commit
Merge branch 'master' of https://github.com/mherfort/MATool

Conflicts:
	assets/www/js/footerScript.js