Merge branch 'master' of https://github.com/shyboys/test

Conflicts:
	ZDB/ZDB.xcodeproj/project.pbxproj
	ZDB/ZDB/BaseTableView.m
	ZDB/ZDB/StoreListCell.h
	ZDB/ZDB/StoreListCell.m
	ZDB/ZDB/StoreListViewConteroller.h
	ZDB/ZDB/StoreListViewConteroller.m
	ZDB/ZDB/StoreListViewConteroller.xib