Fixed problem with merge
Merge branch 'develop' of https://github.com/shuttle1987/footbag-db into develop