This is a version of the multi window patch minus Android Studio changes.
Proguard changes are excluded since there is no config in the master branch
bumped version number
fixed typo in API
add a template plugin for the old cloudmade.com maps. users need to register to get their own API key for this
add some disclaimers to the CloudMade map plugin comments
Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion
Merge branch 'master' into androidstudio
Have everything working now if you don't enable ProGuard.
It will take time to determine how it needs to be configured but that's low priority really.