Add sendmail stuff
Setup mail
Merge branch 'mail'
Merge branch 'master' of github.com:jaaaaared/battlehack-web

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
Merge branch 'master' of github.com:jaaaaared/battlehack-web

Conflicts:
	Gemfile
Reorganize gemfile
Merge branch 'master' into kaiwei/set-db-relations

Conflicts:
	Gemfile
	Gemfile.lock