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
Populating an answer dto with an answer dto factory
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
Null-proofing
Reverting attempted fix for #109 - (80505b4...) as create proposal functionality was broken
Added test for existing create proposal functionality
Card #109: Added tests & functionality to allow users to submit from create proposal screen
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
Fix issue with submitting concept with multiple names (such as "CD 3") due to cpm response concept name entity primary key set on name hence allowing only 1 name per response.
add column rather than drop table
Setup test fixture to read from JSON for better test readability
Adding a few more fields to the regular fixture test