hz
Merge branch 'release-0.2.1-alpha' of github.com:GoliathUA/JF into release-0.2.1-alpha

Conflicts:
	bundle/database/SqlEntityController.php
Fix menu