fix new activity
Merge remote-tracking branch 'origin/master'

Conflicts:
	hythloday-front/app/index.jade
	hythloday-front/app/scripts/controllers/main.js