Merge branch 'master' of https://github.com/DetectiveSquirrel/Pokemon-Go-Rocket-API into personal

Author Edwin <edwin@yohanesedwin.com>
Author date 2016-09-14 23:11:43
Author local date 2016-09-15 06:11:43 +0700
Committer Edwin <edwin@yohanesedwin.com>
Committer date 2016-09-14 23:11:43
Committer local date 2016-09-15 06:11:43 +0700
Commit cdc7f0b3ac3a236497d0e4d9994a0b1c6c3d8714
Tree 854f68d1da8bffbf0abc95e66fc6eacb35c97d75
Parent 1f932dc10140beec610f02715762280ed07b8b73
Parent fd584d14b81ebe279a2b3e06561d6b208fb99098
Merge branch 'master' of https://github.com/DetectiveSquirrel/Pokemon-Go-Rocket-API into personal

Conflicts:
	PokemonGo/RocketAPI/Window/MainForm.cs
	PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs
Affected files:
You may download the files in Public Git.