Merge branch 'master' of f:/repositories/alumni-tracker

Conflicts:
	application/controllers/mailer.php
Merge branch 'master' of f:/repositories/alumni-tracker