no message
Merge branch 'production' of https://github.com/pmpu/serverhouse into production

Conflicts:
	app/server/serverhouse_web/serverhouse_web/App_Data/aspnet-serverhouse_web-20141114202322.mdf
	app/server/serverhouse_web/serverhouse_web/App_Data/aspnet-serverhouse_web-20141114202322_log.ldf