fixed email config and add dalayed job feature
Merge branch 'master' of github.com:adslyw/sharebox

Conflicts:
	config/initializers/setup_email.rb