Merge branch 'master' of https://github.com/vcubells/juansapp

Conflicts:
	app/models/user.rb
Merge branch 'master' of https://github.com/vcubells/juansapp

Conflicts:
	app/models/user.rb