updated controller
updated proposal controller
Merge branch 'master' of https://github.com/persephione/ARCC

Conflicts:
	ARCC/Controllers/ARCCProposalController.cs