User table updates and yearly holiday with basic backend
Merge remote-tracking branch 'origin/tag1'

Conflicts:
	site/languages/en-GB/en-GB.com_ddctap.ini
	site/views/department/html.php
	site/views/department/tmpl/default.php
Merge branch 'master' of https://github.com/redbluesquare/com_ddctap

Conflicts:
	site/languages/en-GB/en-GB.com_ddctap.ini