Added missing translations, sortable rooms
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/customers/index.html.haml
Merge remote-tracking branch 'origin/master'