[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'
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
Daniel - Moving all functional-tests from src/main/java to src/test/java
exclude some additional component files that are not particularly useful
Merge pull request #37 from imxerxes/GruntAndBower

Still including external JS libs in components directory and gitignore. Need to install node on build servers and dev machines for JS build as the next step.
Changing test to use Mockito's ArgumentCaptor on the service api instead of verifying mocked entities in order to verify future data-binding