trying to fix " Cannot modify header information - headers already sent by" error
Merge branch 'templating'