Fixed some pathways.
more pathway fixes.
Fixed some missing template files (tpl to php conversion)
Merge branch 'tester' into dev