CSPACE-6238: Adding conditioncheck procedure. All unit tests pass on Safari/OS X 10.9.4
CSPACE-6313: Adding valuationcontrol procedure. All unit tests pass on Safari/OS X 10.9.4
Merge remote-tracking branch 'origin/valuationcontrol' into CSPACE-6235-plus-6310

Conflicts:
	src/main/webapp/defaults/bundle/core-messages.properties
	src/test/data/basic/role/2771b1f7-4998-4dee-a2b7-5d3c6da8d999.json
	src/test/data/basic/role/a0d7de95-b7f1-404c-9a02-5d804445107d.json
	src/test/js/CreateNewTest.js
	src/test/js/SidebarTest.js
CSPACE-6439: Change an erroneous comma to a period in the password reset message.
Merge pull request #245 from ray-lee/CSPACE-6439

CSPACE-6439
CSPACE-6444: Add comment to cspace.appcache.
Merge pull request #246 from ray-lee/CSPACE-6444

CSPACE-6444