+
Merge branch 'dev' of https://github.com/aryabov-igs/flats_backbone-mvc into dev

Conflicts:
	Core/obj/Debug/Core.dll
	Core/obj/Debug/Core.pdb
	Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	flats.v12.suo
	flats/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	flats/obj/Debug/flats.csprojResolveAssemblyReference.cache
	flats/obj/Debug/flats.dll
	flats/obj/Debug/flats.pdb
+