[add] debug info on time tracker
Merge branch 'master' of https://github.com/tiltfactory/open-atrium

Conflicts:
	docroot/sites/all/modules/custom/oa_webagency/oa_webagency.pages.inc