Merge branch 'master' of git.yohanesedwin.com:/home/git/publicgit/pogo-bot into personal

Merge branch 'master' of git.yohanesedwin.com:/home/git/publicgit/pogo-bot into personal

Conflicts:
	.vs/Pokemon Go Rocket API/v14/.suo
	PokemonGo/RocketAPI/Window/MainForm.cs
	PokemonGo/RocketAPI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PokemonGo/RocketAPI/obj/Debug/Pokemon Go Rocket API.dll
	PokemonGo/RocketAPI/obj/Debug/Pokemon Go Rocket API.pdb
	PokemonGo/RocketAPI/obj/Debug/PokemonGo.RocketAPI.csproj.FileListAbsolute.txt
	PokemonGo/RocketAPI/obj/Debug/PokemonGo.RocketAPI.csprojResolveAssemblyReference.cache