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

Conflicts:
	Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	flats.v12.suo
	flats/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache