Sortable columns!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	spec/models/room_spec.rb