Working on app crash
Merge branch 'master' of https://github.com/cevn/wmbadminton