Merge branch 'master' into dnsadmin.blindtroll.com

Conflicts:
	app/assets/stylesheets/main.css
	app/views/servers/_buttons.html.erb
	app/views/servers/show.html.erb
	app/views/zones/_buttons.html.erb
	app/views/zones/index.html.erb
	db/schema.rb