Updated Views and controllers
Merge branch 'master' of https://github.com/jbossen/P3-Program

Conflicts:
	Program/TestWeb2/Controllers/OrganizationController.cs