Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
instead of showing a popup alert on edit/create page, redirect back to list and show message at top of screen.
don't forget change to alerts service API
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
attempt to resolve merge conflict by commit that was snuck underneath PR
resolve merge conflict
turns out there's a more suitable style for non-error alert messages
Merge branch 'RedirectAfterSubmit' of https://github.com/imxerxes/openmrs-cpm into RedirectAfterSubmit

Conflicts:
	omod/src/main/webapp/resources/js/controllers/EditProposalCtrl.js
	omod/src/main/webapp/resources/partials/ListProposals.html
	omod/src/test/webapp/unit/controllers/EditProposalCtrlSpec.js
Merge pull request #34 from imxerxes/RedirectAfterSubmit

Redirect after submit