fix bugs
Merge branch 'master' of https://github.com/fsjack/JKTabBarController

Conflicts:
	JKTabBarController/JKTabBarController.m