trying to display single flat's details using angular
Merge branch 'master' of https://github.com/elpassion/flatmate
move flat creation to the right place
display flat owner badge in flats list
Merge branch 'master' of github.com:elpassion/flatmate

Conflicts:
	app/views/flats/index.html.slim
	app/views/flats/show.html.slim
ShowFlatCtrl where it should be
Merge branch 'master' into Shopings
assign user a random colour when creating
hover for flats list
showing users in flat show
working items
remove conflicts