Merge to DEV
Merge
Merge
Merge remote-tracking branch 'origin/dev' into test
gitignore fix
move manager dashboard  functions to the manager base class
Return gitignore to its rightful place
Add back in add tasks
Remove fucking CSS
move manager admin to new view
Messing around with add task
.gitignore is now working
Added closemodal back in
Merge branch 'dev' of https://github.com/Decidebloom/Intranet into dev
remove cfg file
Refactoring a bit
refactoring the manager performance and admin view
Merge branch 'dev' of https://github.com/Decidebloom/Intranet into dev
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