merge on mac
Merge branch 'master' of https://github.com/vikster93/gtcw

Conflicts:
	Mailer.js