Progress on template editor & new templating features
Renamed filterSrv to timeSrv and made it a service again
continued large refactoring of filterSrv, timeSrv and templating