delayed job added for action mailer
user invitation updated
Merge branch 'develop' of github.com:joshsoftware/intranet into develop

Conflicts:
	app/models/public_profile.rb
models for leave management added
Merge branch 'develop' of github.com:joshsoftware/intranet into develop