new effect
Merge branch 'develop' of https://github.com/KaiZhang890/iOS-template into develop

Conflicts:
	Template/Template/Classes/ScrollTableViewController.h
	Template/Template/Classes/ScrollTableViewController.m