-converted search concept dialog popup into directive
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm into fix_113

Conflicts:
	omod/src/main/webapp/resources/js/controllers/EditProposalCtrl.js
merged with Kent's changes
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm into fix_113
-directive-fied search concept dialog
-removed unecessary factory classes (now design by spec)
-fixed issue card #133 -- closing search concept dialog right after opening will stop search concept dialog from opening again
-general refactoring
-unit tests for jqueryUiDialog
-jqueryUiDialog can now be used to wrap any div block and make it a dialog
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm into fix_113
-fixed bug with title and close dialog
-fixed test
Update ReviewConceptCtrl.js

fixed formatting.
merged with Fix #33
Merged with Cathy's fix #33
Merge branch 'fix_113' of https://github.com/yinshen/openmrs-cpm into fix_113
minor typo fix.
removed temp file.
grunt jshint formatting changes
-removed strange dir
Merge pull request #42 from yinshen/fix_113

Fix 133
Update README.md
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
cleaned