PR for #552 broken propel ../.. paths changed to ../ and missing Edit/FormbuilderTemplate
Merge pull request #565 from bmelman/master

fixed propel template paths and copied missing edit template