Mail Functionality Added
Merge branch 'master' into views

Conflicts:
	Resources/wordpress.js