Merge field GUIDs instead of overwriting them for portal field counts
Merge branch '107' of git://github.com/phoenixsong6/ingress-intel-total-conversion into phoenixsong6-107
make uniqueArray its own function
Merge branch 'gh-pages' of github.com:breunigs/ingress-intel-total-conversion into gh-pages