changes in conflict
changes
Merge branch 'master' of github.com:Michaluch/rv005UI

Conflicts:
	application/static/scripts/pages/ScrumBoard/templates/HeaderView.html