Merge branch 'master' of git://github.com/ZasoGD/ingress-intel-total-conversion into ZasoGD-master
added switch to map trigger
Merge branch 'master' into ZasoGD-master
Merge branch 'master' into ZasoGD-master
Merge branch 'master' into ZasoGD-master
switch to map on bookmark click
code formatting