Merge branch 'development' into feature/ios-7-ui

Resolved Conflicts:
	Socialize.xcodeproj/project.pbxproj
Updated Pinterest icon