Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
fixed issue #120 "prevent user from adding same concept more than once to a proposal" with Ceola
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm into card_120_fix_plus_test

Conflicts:
	omod/src/main/webapp/resources/js/controllers/EditProposalCtrl.js
	omod/src/test/webapp/unit/controllers/EditProposalCtrlSpec.js
-removing swap/history files created by the IDE
-deleting files created by ide
-fixed issue where it was still possible to add newly returned concepts from the database more than once in the concept proposal screen.
Applied Kent's recommendations:
-Added underscore to project.
-Converted functional style array funcs to underscore for ie8 support
-Refactored the merge concepts function in EditProposal to use _.union
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
Merge pull request #33 from yinshen/card_120_fix_plus_test

Card 120 fix plus test
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
Fixing test method name
Adding a dto for coded answers
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