Just now getting setup on my new mac and i don't remember these changes
Removed test buttons from nib
Merge branch 'master' of https://github.com/plusharray/SBA-Sites---iOS

Conflicts:
	SBA Sites.xcodeproj/project.pbxproj
	SBA Sites/SBA Sites-Info.plist
	SBA Sites/SBAConstants.m
	SBA Sites/SiteImageViewController.xib