Merge branch 'master' of github.com:phurbu/market

Conflicts:
Market.xcodeproj/project.pbxproj
Merge branch 'master' of github.com:phurbu/market

Conflicts:
	Market.xcodeproj/project.pbxproj