update
Merge branch 'devbranch' of https://github.com/mfit/jamjump into devbranch