Failboat.
Merge branch 'master' of https://github.com/redsh1ftr/CDS_a

Conflicts:
	app/controllers/NorController.php
	app/views/cases/create_new_nor.blade.php