Woswasi
Merge branch 'master' of https://github.com/thomashummer/retailone

Conflicts:
	retailone.xcodeproj/project.xcworkspace/xcshareddata/retailone.xccheckout