test
Fix url redirect
Fix views render
Merge remote-tracking branch 'origin/master'

Conflicts:
	library/Gen/Site.php
	library/Gen/Templates/Template2/controller.template
	library/Gen/Templates/Template2/project/application/layouts/scripts/header.phtml
	library/Gen/Templates/Template2/project/application/views/helpers/RenderFormElement.php
	library/Gen/Templates/Template2/project/application/views/helpers/RenderTh.php
	library/Gen/Templates/Template2/view.add.template
	library/Gen/Templates/Template2/view.delete.template
	library/Gen/Templates/Template2/view.show-all.template
	library/Gen/Templates/Template2/view.update.template