Merge branch 'master' into development
Merge branch 'development' of https://github.com/JeroenMathon/Vocaloid-Quiz-Android-Edition into development