fix
Merge branch 'master' of https://github.com/fborraccetti/euphoria

Conflicts:
	hmvc-modules/admin/scripts/Model_T
fix