Card 126 - Display error message when the settings seem invalid.  They are
considered invalid if the request for settings on the corresponding server
fails.
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
Initial work on filling in users details automatically when creating a new
proposal
Work so far on automatically populating new proposal fields, several
things to tidy up
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
Take email from the most recently created proposal because it is not
available from the user's profile.  Also take the name from the most
recent proposal if it cannot be taken from the user's profile.  Add tests,
and fix small but with taking name from users profile.
Merge branch 'master' of https://github.com/OpenMRS-Australia/openmrs-cpm
Add separate action method for getting empty proposal, removing the magic value "0" to imply this.  Other small tidying up.
Take prefilled email address for new proposal from the user's notification email.  If this is not set then it is taken from the most recent proposal.
Merge pull request #56 from aidanbebbington/master

Prefill name and email fields with creating a new proposal (note: there are also changes to the settings page included in this PR that weren't previously merged into the main repository).
Merge branch 'master' into split

Conflicts:
	conceptpropose/omod/src/main/java/org/openmrs/module/conceptpropose/web/controller/CpmSettingsController.java
	conceptpropose/omod/src/main/java/org/openmrs/module/conceptpropose/web/controller/ProposalController.java
	conceptpropose/omod/src/test/webapp/unit/controllers/EditProposalCtrlSpec.js