migrated roles column
merged conflicts
removed old shelter text fields
Change resources to use base URL.
finished the pledge cart page and the thank you page
Merge branch 'master' of https://github.com/stringbeans/homelesspartners
Merge branch 'davebranch'

Conflicts:
	protected/controllers/ShelterController.php
added gift requests to the story edit gui