daily commit
Merge branch 'master' of https://github.com/justinrw/gadgetdoctors

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/staff_controller.rb
	app/models/employee.rb
	app/views/addons/_nav.html.erb
	app/views/employees/_avatar.html.erb
	app/views/employees/index.html.erb
	app/views/layouts/application.html.erb
	app/views/roles/index.html.erb
	config/routes.rb