code reorder
code reorder
Merge branch 'master' of https://github.com/aburone/titi

Conflicts:
	models/user.rb