Bug Input
Merge branch 'master' of https://github.com/EasyLovine/esx_eu

Conflicts:
	includes/templates/template_default/common/tpl_main_page.php

ok merge