Merge branch 'master' of https://github.com/swishy/Mitsumame

Conflicts:
	src/main/kotlin/webservices/core.kt