Allowed non-xBehave projets to work (still needs work)
Updated templates