front changes to add userlist
Merge branch 'master' of github.com:PIWEEK/mrfogg
working on userlist
Merge branch 'master' of github.com:PIWEEK/mrfogg

Conflicts:
	mrfogg-front/app/coffee/app.coffee