Adds User history
Merge branch 'master' of github.com:Nadrieril/bars-angular

Conflicts:
	app/views/User/detail.html