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

Author Edwin <edwin@yohanesedwin.com>
Author date 2016-07-26 19:27:00
Author local date 2016-07-27 02:27:00 +0700
Committer Edwin <edwin@yohanesedwin.com>
Committer date 2016-07-26 19:27:00
Committer local date 2016-07-27 02:27:00 +0700
Commit c57f4fd3a61c9ef3bc366386476ae4d9df53ee5e
Tree 95892f1b8577178ae2d865f1d13048fea172b519
Parent c7ca2e746fec784ddb18b7e7d0fb02bfba497d98
Parent 906828994ff2baad0d085aa784fa4ecf58068167
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
Affected files:
PokemonGo/RocketAPI/Window/MainForm.cs
You may download the files in Public Git.