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

Author Edwin <edwin@yohanesedwin.com>
Author date 2016-08-03 21:38:09
Author local date 2016-08-04 04:38:09 +0700
Committer Edwin <edwin@yohanesedwin.com>
Committer date 2016-08-03 21:38:09
Committer local date 2016-08-04 04:38:09 +0700
Commit 1f932dc10140beec610f02715762280ed07b8b73
Tree 7691b3b0f754b1733f380646d31759e205e90c58
Parent 82e16d235f8259e90bccc237243ce31eb989df63
Parent e6770511d90a59fa0cedf0633d5675913d04a54b
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:
PokemonGo/RocketAPI/Window/MainForm.cs
PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs
You may download the files in Public Git.