Changed campers/add, campers/edit, campers/index, users/addCamper, users/edit
Merge branch 'master' of https://github.com/sgreenstein/salk-a

Conflicts:
	app/View/Campers/add.ctp
	app/View/Campers/edit.ctp
	app/View/Campers/index.ctp
	app/View/Users/add_camper.ctp
	app/View/Users/edit.ctp