Trying to go back to before things were broken.
Merge branch 'master' of https://github.com/redsh1ftr/CDS_a

Conflicts:
	app/controllers/NorController.php