fix
fix settings
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/routes.rb

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/controllers/admin/settings_controller.rb
	modified:   app/models/setting.rb
	modified:   app/models/task.rb
	modified:   app/views/admin/_tasks.html.erb
	modified:   app/views/admin/clients/partials/_tasks.html.erb
	modified:   app/views/admin/clients/partials/_tickets.html.erb
	modified:   app/views/admin/clients/show.html.erb
	modified:   app/views/admin/contacts/index.html.erb
	modified:   app/views/admin/settings/_form.html.erb
	modified:   app/views/admin/settings/index.html.erb
	modified:   app/views/admin/tasks/_tasks.html.erb
	modified:   app/views/admin/tasks/new.js.erb
	modified:   app/views/layouts/admin.html.erb
	modified:   config/initializers/authority.rb
	new file:   config/initializers/default_settings.rb
	modified:   config/routes.rb
	modified:   db/seeds.rb
	new file:   script/mailman_server
fix routes
add high voltage
Merge remote-tracking branch 'upstream/master'
fix routes
Merge remote-tracking branch 'upstream/master'
fix static pages
fix
	deleted:    app/views/labs/future.html.erb
	deleted:    app/views/labs/helpdesk.html.erb
        deleted:    app/views/labs/platform.html.erb
	modified:   app/views/welcome/index.html.erb
	modified:   config/routes.rb
	app/views/pages/
fix
	modified:   app/views/layouts/_nav.html.erb
	modified:   app/views/layouts/application.html.erb
	deleted:    app/views/welcome/about.html.erb
	deleted:    app/views/welcome/contact.html.erb
	deleted:    app/views/welcome/index.html.erb
	modified:   config/routes.rb
	app/views/pages/about.html.erb
	app/views/pages/contact.html.erb
	app/views/pages/home.html.erb
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/routes.rb

	modified:   .gitignore
	modified:   config/initializers/high_voltage.rb
	modified:   config/routes.rb

	app/views/pages/about.html.erb
	app/views/pages/contact.html.erb
	app/views/pages/home.html.erb
fix
fix blog url
Merge remote-tracking branch 'upstream/master'
fix up
fix login
Merge remote-tracking branch 'upstream/master'