5
Merge branch 'master' of https://github.com/onevic/SportsShopping

Conflicts:
	SportsShopping.xcodeproj/project.pbxproj
	SportsShopping/STHomeViewController.m