Drop down fix
Issue in model
Merge branch 'master' of https://github.com/Javed43/Edu-M

Conflicts:
	app/controllers/sublists_controller.rb
	app/views/devise/confirmations/new.html.erb
	app/views/devise/passwords/edit.html.erb
	app/views/devise/passwords/new.html.erb
	app/views/devise/registrations/new.html.erb
	app/views/devise/sessions/new.html.erb
	app/views/devise/shared/_links.erb
	app/views/layouts/slate.html.erb
	app/views/lists/_form.html.erb
	app/views/lists/index.html.erb
	app/views/lists/show.html.erb
	app/views/sublists/_form.html.erb
	app/views/sublists/index.html.erb
	app/views/sublists/view.html.erb
	db/seeds.rb