Changed some sizes
Merge branch 'master' of https://github.com/Sensechen/Version-2

Conflicts:
	html/emailform.php
	html/upload_file.php