Setting right email address.
Merge branch 'master' of https://github.com/Jerome-PS/Slic3r
Making it work on non-Win32.

Conflicts:
	slic3r.pl