Improves constant names.
Merge branch 'master' of github.com:tarbrain/TBCollectionCanvas

Conflicts:
	Classes/ios/Views/TBCollectionCanvasContentView.m
	Classes/ios/Views/TBCollectionCanvasView.h
	Classes/ios/Views/TBCollectionCanvasView.m
	CollectionCanvasDemo/CollectionCanvasDemo/CollectionCanvasViewController.m

Fixed.