1
Merge branch 'master' of github.com:johnnyeven/Becterial

Conflicts:
	Source/CashStoreItemView.m
	Source/CashStoreViewController.m
	bacterial.xcodeproj/project.pbxproj
	bacterial.xcodeproj/project.xcworkspace/xcuserdata/johnnyeven.xcuserdatad/UserInterfaceState.xcuserstate
	bacterial.xcodeproj/xcuserdata/johnnyeven.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist