ниче ососбо не добавил
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	FancyImageUploader.v11.suo
	FancyImageUploader/App_Data/ShareitDatabaset-20140609215157.mdf
	FancyImageUploader/App_Data/ShareitDatabaset-20140609215157_log.ldf

	FancyImageUploader/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache