Push develop to staging

## New features:
- Add Payment Plan to Sponsor
- Cancelling Edit takes user back to Show instead of Index
- Add City to Sponsor

## Reworked feature:
- Improve User views as per client spec

## Under the hood:
- Ensure Organization name uniqueness in factory
- Add unique indexes to db columns for unique values
- Add missing indexes to foreign keys