Changed CHANGELOG and AUTHORS file
Merge pull request #37 from jaipurchamp/fix_errors

Fixing sendMail icon and tooltip.
Merge remote-tracking branch 'upstream/master' into code_fixes

Conflicts:
	CHANGELOG