resolution conflit
Merge branch 'master' of https://github.com/Gnuk/ScrumDashboard