default sort on orders table, and specs
adding city to user, omg time
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/base/_forms.sass