db migration
Merge branch 'dev' of https://github.com/Bergrebell/CyberCoach into dev
Soccers controller, bug fix in boxing edit
Add soccer views
Add routes for soccer
Bug fix in boxing edit; bug fix #52; soccer CRUD, popup calendar
Remove conflicts