Many updates. More blocks. More awesome.
Merge branch 'master' of github.com:ojstewart/CIVCategories

Conflicts:
	UILabel+Animate.m