Merge to DEV
Merge
Merge
Merge branch 'dev' of https://github.com/Decidebloom/Intranet into dev

Conflicts:
	application/views/digital/T_managerDashboard.php
	application/views/digital/footer.php
	assets/css/digital/main.css
	assets/css/digital/main.min-dist.css
	assets/css/digital/main.min.css
	assets/js/digital/views/managerDashboard.js
Merge branch 'dev' of https://github.com/Decidebloom/Intranet into dev

Conflicts:
	assets/css/digital/prepros.cfg