Simplified & alphabetized templatetags
refs #651 - Prevent double click on clock in, clock out, and pause
Fix failing test
Typo
refs #651 - Use select_for_update() for user on clock in
To avoid creation of two active entries.
Merge remote-tracking branch 'origin/develop' into template-tags

Conflicts:
	timepiece/templates/timepiece/dashboard.html
	timepiece/templates/timepiece/user/timesheet/view.html
	timepiece/templatetags/timepiece_tags.py
Remove hours_to_seconds
Merge remote-tracking branch 'origin/develop' into 651-two-active-entries

Conflicts:
	timepiece/entries/tests/timesheet.py
refs #651 - select_for_update() active_entry instead of user
Restore template tag utilies for time sheet URLs
refs #711 - Show correct link for permanent tab
Updated release notes
Remove errant ipdb statement
Fixes #714 - Alert before contract date expires
Added expired/about-to-expire info to contract detail view
This oversight was pointed out by @tobiasmcnulty.
Merge pull request #712 from caktus/711-permanent-tabs

Fixes #711 - Show correct link for permanent tab
Merge pull request #698 from caktus/template-tags

Simplified & alphabetized templatetags
Merge pull request #703 from caktus/651-two-active-entries

Fixes #651 - Prevent creation two active entries on clock in
Update release notes
Merge remote-tracking branch 'origin/develop' into 661-validation

Conflicts:
	timepiece/templates/timepiece/contract/list.html
	timepiece/templates/timepiece/contract/view.html
	timepiece/templates/timepiece/dashboard.html