fixed broken merge
Updated formatting
update deploy
Merge branch 'master' of
http://github.com/Jabberwocked/Miljoenenidee.git

Conflicts:
	class/deploy.php