Codesniff cleanup for user model
Changed edit form to match submit form
Aligned assignemnts in array
Removed paragraphs in header
Merge branch 'master' into cs_user_model
Merge remote-tracking branch 'dstockto/cs_user_model'
Merge remote-tracking branch 'stevangoode/JOINDIN-154' into edit-event-form

Conflicts:
	src/system/application/controllers/event.php