Merge pull request #1 from ningosi/master

Initial commit - OCLM-1
OCLM-5 Store updates
Merge branch 'OCLM-2'

Conflicts:
	api/src/main/resources/moduleApplicationContext.xml
Disabled app, added metadatadeploy as a required module and removed a variable being refernced from a missing controller