bump version
Merge branch 'release_2.6.1' into develop
merge conflict
basic structure presence overview
Add presence logic to dashboard
Change presence view to real presence
Fix profile timeline error and form
added logo tv screen
Switch back to dev profile
builded version
Merge branch 'develop' of https://github.com/askcs/webpaigebase into develop
Forgot conditional check
set up absence in dashboard
Merge remote-tracking branch 'webpaigebase/develop' into white-label

Conflicts:
	app/views/dashboard.jade
	dist/index.html
	dist/scripts/config.js
	dist/scripts/main.94481dfe.js
	dist/styles/main.ced894a9.css
	dist/views/dashboard.html