add fake user
Merge remote-tracking branch 'origin/master'

Conflicts:
	hythloday-front/app/scripts/app.js