Split measurements from labs to Care Elements
Minor template and test fixes

Change-Id: I46fc35fd2b138f86d98f5ce9f854e9e42959b34c
Signed-off-by: Jeremy Ho <jujaga@gmail.com>

Conflicts:

	src/main/java/oscar/oscarDemographic/pageUtil/DemographicExportAction4.java
Disable login UI and session timeout set to 0

Change-Id: I050e5bcdbcdf33ae02efbee8c895418135e77556
Signed-off-by: Jeremy Ho <jujaga@gmail.com>