add rails_12factor for heroku
change Gem source for heroku
remove taobao source
add sqlite3 to development and test
add end } for body
Merge branch 'master' into deploy

Conflicts:
	Gemfile
	Gemfile.lock
add Gemfile.lock
Merge branch 'master' into deploy

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/application.css
add Gemfile.lock
use zhu@zlxstar.me as send mail
make email notification delay
Merge branch 'master' into deploy

Conflicts:
	app/controllers/activities_controller.rb
Merge branch 'master' into deploy

Conflicts:
	Gemfile
update Gemfile.lock
add Procfile to run delayed_job and use gmail to send email
add scheduler.rake for heroku and delete delayed_job.rake
Merge branch 'master' into deploy

Conflicts:
	lib/tasks/delayed_job.rake
change activity time format and locale
fix typo
fix delayed job push after time bug