User Panel (work in progress)
Merge branch 'master' of https://github.com/santiagopiria/Sultanapp

Conflicts:
	app/models/User.java
tabs styles y login andando
merge cambios en el home.js