Ernst v1
Merge remote-tracking branch 'origin/master'

Conflicts:
	GFE_main_res.php