commit
Merge branch 'develop' of https://github.com/YAInternship2014/Owe into develop

Conflicts:
	Owe.xcodeproj/xcuserdata/ekaterinanizicenko.xcuserdatad/xcschemes/xcschememanagement.plist
	Owe.xcworkspace/xcuserdata/ekaterinanizicenko.xcuserdatad/UserInterfaceState.xcuserstate
	Pods/Pods.xcodeproj/xcuserdata/ekaterinanizicenko.xcuserdatad/xcschemes/xcschememanagement.plist