merged from report branch
changes to create different templates for branch and other department