After scrolling added
Merge branch 'master' of github.com:extrajordanary/bloxy

Conflicts:
	bloxy.spritebuilder/Source/BlockScroller.h
	bloxy.spritebuilder/Source/BlockScroller.m
	bloxy.spritebuilder/Source/Play.m
	bloxy.spritebuilder/Source/Resources/Published-iOS/Play.ccbi