Update psycopg2==2.4.1 -> psycopg2==2.5
Change navbar collapse width
Changed from 979px to 840px.
Fixes #689 - Missing <td> on project time sheet
Merge branch 'master' into develop
Fixes #693 - Trackable projects in quick clock in processor
refs #691 - Checkbox status filter on outstanding hours page
Split view methods from main test base
Most classes don't use these functions.
Update tests for outstanding hours view
Global highlight and hover color changes
Also removed some unused styles
refs #688 - Sticky highlight on payroll summary
Merge pull request #687 from caktus/679-navbar-width

refs #679 - Change navbar collapse width
Merge pull request #694 from caktus/691-checkbox-filter

refs #691 - Status filter on outstanding hours view
Merge pull request #686 from caktus/update-psycopg2

refs #193 - Update psycopg2
Attempt to make highlight functions more similar
Not very successful attempt. The functions are similar but I was unable to pull out a generic construct without more work than the few lines of code seemed worth.
Merge pull request #695 from caktus/688-highlighting

refs #688 - Sticky highlighting on payroll summary
refs #653 - Admins see unpublished hours on schedule view page
With red font color.
Fix broken test
refs #664 - Refactor total progress area on dashboard
To show the same information as is shown for each project, in order to make more clear how much the user has worked overtime or undertime.
Simplified & alphabetized templatetags
Fix bug - Didn't list any invoices until form was bound