test changes
added selenium to test javascript in cucumber
Merge branch 'master' of https://github.com/JonZach/gp_v2 into Brandon

Conflicts:
	app/assets/javascripts/application.js
	features/user_can_sign_up_as_a_homeowner.feature
non-logged-in user can contact greenpal
Non-Logged-In User: can access home page and how-it-works page
added flash messages
greenpal notified of new vendor application
added admin dashboard
admins can approve vendor applications
added admin helper module
refactoring
more refactoring
vendors are notified of auction in their area
slight refactoring
Merge branch 'Brandon' of https://github.com/JonZach/gp_v2 into Brandon

Conflicts:
	app/controllers/appointments_controller.rb
	app/mailers/user_mailer.rb
	app/views/layouts/application.html.erb
	features/step_definitions/homeowner_steps.rb
	features/step_definitions/vendor_steps.rb
Merge branch 'master' into Brandon

Conflicts:
	app/views/layouts/application.html.erb
	features/step_definitions/homeowner_steps.rb
merging fixes
vendor can designate service range
homeowner notified when appointment completed
pulling changes