General Settings Control Panel
Layout Changes
Advanced Settings
Settings
Settings
Merge branch 'master' of madisonpdx:madisonpdx/MadisonLive

Conflicts:
	MadisonLive
	app/views/devise/registrations/edit.html.erb
	app/views/generalsettings/show.html.erb
	app/views/layouts/application.html.erb
	config/routes.rb
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Delete uneeded users controller.