Fixed failing jasmine test

Conflicts:
	cms/static/coffee/src/main.coffee