Color square stuff
Merge branch 'master' into mediaManagerDev

Conflicts:
	ColorThief/ColorThief.xcodeproj/project.pbxproj
	ColorThief/ColorThief/CTGrabberViewController.m
	ColorThief/ColorThief/en.lproj/MainStoryboard.storyboard