Fix schema
Update development template to point media URL to media.scpr.org
Better message
Merge remote-tracking branch 'origin/master' into rails4

Conflicts:
	db/schema.rb