Fixes #9, #10, #11, #12; overriden templates moved to child FOS bundle