created order for units as well as limited unit index view for users
Merge branch 'diego'

Conflicts:
	app/models/user.rb