committing wip
Merge branch 'master' of https://github.com/jogloran/JSSlidingViewController

Conflicts:
	JSSlidingViewController/JSSlidingViewController.m