Improve Tabbar UI
Merge branch 'master' of https://github.com/englishtown/EFHackson2013

Conflicts:
	TestBarcodeScanner.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/englishtown/EFHackson2013