Merge branch 'master' of ssh://github.com/just-paja/improliga

Conflicts:
	share/scripts/ui/intra/team/attendance/browser.js
Merge branch 'master' of ssh://github.com/just-paja/improliga

Conflicts:
	share/scripts/ui/intra/team/attendance/browser.js