[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'
Daniel - Moving all functional-tests from src/main/java to src/test/java
Merge remote-tracking branch 'upstream/master'
[TASK-117][Daniel] - Adding in maven profiles for unitTesting, and functionalTests, and runAll
[Task-117][Daniel] - Cleaning up functional-test project
[Task-117][Daniel] - Reverting previous commit, that modified the config.properties to the local environment URL
[Task-117][Daniel] - Making unitTest profile the default profile
Merge pull request #38 from dtong2/master

Modified functional-tests project to incorporate Cucumber tests
Patrick, Atiq & Dave: Added test for fetching a proposal DTO in preparation for data-binding
Ignoring test - not sure why failing
Daniel - Fixing functional tests. Some angular Js controllers were referring to the non-existant MenuService contoller
Merge pull request #39 from dtong2/master

Daniel - Fixing functional tests. No tests yet, but need to fix build ASAP.
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm