[Task-54][Daniel] - Adding Cucumber Spike, creating 'SettingsPage.feature' which is a conversion of the existing functional selenium test 'shouldPersistUrlUsernamePassword' (TestSettingsPage.java)
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
[Task-54][Daniel] - Adding in unimplemented features for Settings and Proposals
Merge remote-tracking branch 'upstream/master'
can autoincrement column that hasn't been added. fix migration script.
fix tab v. whitespace confusion issue
consolidate RequireJS configuration into common file
don't show (empty) alerts box if there are no alerts
use bower to manage javascript libraries (note: better to keep bower libs out of github, but source control them until appropriate build tasks can be created)
fix path to jquery-ui
add a very simple grunt build that just lints and tests (not passing yet)
fix jquery-ui path (take 3)
Merge branch 'AddBower' into Grunt
fix JSHint issues
Improved verification
-converted search concept dialog popup into directive
Daniel - Moving all functional-tests from src/main/java to src/test/java