small bug
Merge branch 'master' of github.com:atmosx/pritory

Conflicts:
	routes/user.rb
Changed - slight mods