merge #86, with some tweaks in the case AT_PLAYER area so it's cleaner
Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion