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

Conflicts:
	cms.js