update frontend
update backend
update frontend
update frontend
Merge branch 'master' into develop
Merge pull request #137 from sigal/develop

update frontend
update frontend
Merge branch 'master' of github.com:diddipoeler/sportsmanagement
bugtracker id 0000056
update backend
update backend
update backend
update backend
update backend
update backend
update frontend
update backend
update backend
Merge branch 'master' into develop