Merge pull request #565 from bmelman/master

fixed propel template paths and copied missing edit template
edit template route -> _object + {id}/{action} path fix