Alterado user view
Merge branch 'master' of https://github.com/jeanrock/timeline-front

Conflicts:
	app/index.html