removed merge conflict on custom listbuilderTemplate
Merge branch 'master' of git://github.com/Edge5/Edge5AppBackendBundle