FIX: fix form and show user
Merge branch 'master' of github.com:smarquezs/sample_app

Conflicts:
	.gitignore