New files
Removed old file
A lot of changes
Merge remote branch 'upstream/master'

Conflicts:
	pages/MainController.php
	views/Layout.phtml
	views/MainView.phtml