Add delayed_job for sending reset password email.
Merge branch 'master' of https://github.com/codeanpeace/project-x

Conflicts:
	Gemfile