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

Conflicts:
	hmvc-modules/entity/controllers/manager.php