Merge branch 'hotfix-2.1.4'
Merge branch 'hotfix-2.1.5'
Version bumped to 2.1.6
Removed "tracker" from title.
Merge branch 'hotfix-2.1.6' into develop
Merge branch 'hotfix-2.1.6'
Version bumped to 2.1.7
Added more time-slots.
Tabular admin can now be ordered by any column.
Merge branch 'hotfix-2.1.7' into develop