reupload changes
merging phase01 with phase01 admin
remove rubymine .idea folder
removed .idea/* rubymine
trying to remove rubymine folder
removed idea -finally
fixed provider views - jqgrid not working properly currently ommitted
fixed check for current_member role for bd
Merge branch 'phase01' of https://github.com/magicalbanana/datenightsitter into magicalbanana-phase01

Conflicts:
	Gemfile.lock
	app/controllers/accounts_controller.rb
	app/controllers/application_controller.rb
	app/controllers/members/admin/admins_controller.rb
	app/controllers/members/admin/date_night_slots_controller.rb
	app/controllers/members/admin/sittings_controller.rb
	app/controllers/members/provider/providers_controller.rb
	app/controllers/members/seeker/seekers_controller.rb
	app/controllers/members_controller.rb
	app/models/date_night_slot.rb
	app/views/layouts/_header.html.erb
	app/views/layouts/headers/_links_provider.html.erb
	app/views/layouts/headers/_nav_admin.html.erb
	app/views/layouts/headers/_nav_main.html.erb
	app/views/members/_seeker_existing.html.erb
	app/views/members/_seeker_new.html.erb
	app/views/members/_transactions.html.erb
	app/views/members/date_night_availability.html.erb
	app/views/members/provider_dashboard.html.erb
	config/routes.rb
Merge branch 'magicalbanana-phase01' into admin-functionality