Merge branch 'master' of https://github.com/thebird/Swipe into thebird-master

Conflicts:
	swipe.js