commit
Merge branch 'master' of https://github.com/MountainStarMobile/iOS-POS

Conflicts:
	POS.xcodeproj/project.pbxproj