Dashboard query updates to improve hours calculations and address some complaints re: totals looking wacky
Merge branch 'master' of https://github.com/joelbrock/CHART
fixing mergs conflicts
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART
Merge branch 'master' of https://github.com/joelbrock/CHART