allow to remove and add slides
Merge branch 'master' of github.com:campcentury/campcentury

Conflicts:
	app/js/app.js