Added MAIL_SERVER and _PORT to config.py
Config.py finished for contacting support
Added correct contact form
Merge remote-tracking branch 'upstream/master' into contact

Conflicts:
	config.py