Simplified & alphabetized templatetags
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
Restore template tag utilies for time sheet URLs
Merge pull request #698 from caktus/template-tags

Simplified & alphabetized templatetags