Merge pull request #5 from cspace-deployment/master

NOJIRA: bring this branch up to date with latest webapps changes.