Got square drawing and movement working
Merge branch 'master' into mediaManagerDev

Conflicts:
	ColorThief/ColorThief/CTGrabberViewController.m
	ColorThief/colorSquare.m

Merging Kevin's work with mine.