Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
navbar fix to css
Fixed bug with custom management commands having arguments
Merge branch 'master' of https://github.com/Gavin-McCormick/watttime
Merge branch 'master' into develop