Start Marlon
Merge branch 'master' of https://github.com/Team1982/WebApplicationElements

Conflicts:
	Templates/js/jquery.js
	Templates/mysqldata2.php