added 'My Area' button in header for Server
toggled email confirmations for customers
changed confirm email view to add delivery point
Merge branch 'master' into email_system
admins can set delivery_area for servers
Merge branch 'email_system' of https://github.com/kishkaru/project-mule into email_system
Merge branch 'email_system' of github.com:kishkaru/project-mule into email_system
added delivery area to users views
removed server from seed file
Merge remote-tracking branch 'origin/email_system' into beta

Conflicts:
	app/controllers/delivery_points_controller.rb
	app/views/layouts/_navbar.html.haml