update
Merge branch 'master' of https://github.com/poorevil/InstoreApp

Conflicts:
	InstoreApp.xcodeproj/project.pbxproj
	InstoreApp/Controller/BaseViewController.h
	InstoreApp/Controller/BaseViewController.m
	InstoreApp/Controller/MainViewController.m