-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.
JS unit tests for Menu.getMenu called from controllers
Daniel - Adding in new cucumber feature test specifications
Daniel - Started to refactor cucumber step definitions and selenium page model classes
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Daniel & Saman - Reverting previous refactor (that broke the tests), and refactored the selenium before & after cucumber methods (that creates and destroys the firefox driver) into it's own class
Card 126 - Display error message when the settings seem invalid.  They are
considered invalid if the request for settings on the corresponding server
fails.
Creating Login class that can be used by all test classes to Login and navigate to desired page
Do not search and set search results to empty when search term is blank
Relates to card #33 Scenario: Deleting all of the search criteria
Added tests for no search when search term is blank and
setting results to empty when search term is blank
test refactored