root
got swipe to work with only one page
Merge branch 'master' into menu

Conflicts:
	app/models/data.coffee
	app/models/data.js
	app/models/pages.coffee
	app/models/pages.js