temporaty fix
Merge branch 'master' of https://github.com/atk4/agiletoolkit.org

Conflicts:
	lib/Frontend.php
fix