scheduler and email account setup
back to bcrypt 3.0.0 for heroku
Merge branch 'master' of https://github.com/Benny84/cits3200groupg

Conflicts:
	TODO.txt
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.erb
	app/controllers/triggers_controller.rb
	app/models/item.rb
	app/views/emails/new.html.erb
	app/views/items/edit.html.erb
	app/views/items/index.html.erb
	app/views/items/new.html.erb
	app/views/items/show.html.erb
	app/views/layouts/application.html.erb
	app/views/layouts/sessions.html.erb
	app/views/sessions/new.html.erb