Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
Fix neutral portals have broken random details
Merge pull request #369 from Fragger/neutral-portals-fix

Fix #366 Neutral portals have broken random details
Add guid to window.PLAYER and add constant MAX_RESO_PER_PLAYER
Store player level at setupPlayerStat
Add window.UPGRADE_ANOTHERS_RESONATOR
Merge pull request #370 from Xelio/patch-player-guid-and-max-reso-per-player

Add guid to window.PLAYER and add constant MAX_RESO_PER_PLAYER
Merge remote-tracking branch 'upstream/gh-pages' into test