GON-16: adding new Time Tracker option and moving templates to HAML
Merge branch 'Development' into GON-1