no message
Merge branch 'master' of https://github.com/cloud4s/cloud4s

Conflicts:
	cloud4s/src/main/webapp/WEB-INF/pages/dashboard.jsp