Merge branch 'develop' of https://github.com/patientview/patientview into diabetes_new

Conflicts:
	patientview-parent/common/src/main/resources/sql/admin-scripts/change-nhsnumber.sql
	patientview-parent/common/src/main/resources/sql/features/31/31.sql
	patientview-parent/integration-tests/src/test/resources/rm301_empty_9876543210.xml
	patientview-parent/patientview/pom.xml
	patientview-parent/patientview/src/main/java/org/patientview/patientview/ResultsAction.java
	patientview-parent/patientview/src/main/java/org/patientview/patientview/checkups/CheckupsAction.java
	patientview-parent/patientview/src/main/java/org/patientview/patientview/controller/Routes.java
	patientview-parent/patientview/src/main/java/org/patientview/patientview/controller/SharingThoughtsController.java
	patientview-parent/patientview/src/main/java/org/patientview/patientview/unit/UnitAddAction.java
	patientview-parent/patientview/src/main/java/org/patientview/patientview/unit/UnitUpdateAction.java
	patientview-parent/patientview/src/main/java/org/patientview/patientview/unit/UnitUtils.java
	patientview-parent/patientview/src/main/java/org/patientview/service/SharedThoughtManager.java
	patientview-parent/patientview/src/main/java/org/patientview/service/impl/ImportManagerImpl.java
	patientview-parent/patientview/src/main/java/org/patientview/service/impl/SharedThoughtManagerImpl.java
	patientview-parent/patientview/src/main/java/org/patientview/service/impl/UserManagerImpl.java
	patientview-parent/patientview/src/main/java/org/patientview/utils/LegacySpringUtils.java
	patientview-parent/patientview/src/main/resources/context-legacy.xml
	patientview-parent/patientview/src/main/resources/log4j.properties
	patientview-parent/patientview/src/main/webapp/body/control/unit_add_input.jsp
	patientview-parent/patientview/src/main/webapp/body/join.jsp
	patientview-parent/patientview/src/main/webapp/common/control/left_nav.jsp
	patientview-parent/patientview/src/main/webapp/common/top_nav.jsp
	patientview-parent/patientview/src/main/webapp/control/patient_ibd_input.jsp
	patientview-parent/patientview/src/main/webapp/diabetes/careplan/careplan-edit.jsp
	patientview-parent/patientview/src/main/webapp/diabetes/checkups/checkups.jsp
	patientview-parent/patientview/src/main/webapp/diabetes/help.jsp
	patientview-parent/patientview/src/main/webapp/js/sharedThought.js
Removed to unnecessary change.