added Mailers for Customer, Admin
Merge branch 'master' into email_system
working devise emails
added mail files
Merge branch 'checkout' into email_system

Conflicts:
	config/environments/development.rb
	db/schema.rb
adding checkout emails
Merge branch 'checkout' into email_system
added confirmation emails
Merge branch 'master' into email_system

Conflicts:
	app/models/delivery_point.rb
	db/schema.rb
added SMS option
changed ProjectMule to LuckyBolt
added proper sms lib
Merge branch 'checkout' into email_system

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
Merge branch 'orders' into email_system

Conflicts:
	Gemfile
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
adding buttons for texting customers
Merge branch 'front_page_ryan' into email_system

Conflicts:
	app/controllers/users_registration_controller.rb
	app/helpers/checkout_helper.rb
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
working single sms button
working mass text button
Added boolean 'picked_up' to orders table
Merge branch 'email_system' of github.com:kishkaru/project-mule into email_system