Merge pull request #11 from jonatkins/master

Pull from upstream.
Remove pan control from minimap

(basically same issue as c537811e9b996bdcda80510d4e04e17fd3654796)
Merge pull request #693 from fkloft/pancontrol

Remove pan control from minimap
plugin draw resonator update

Update to code for disabled on out of zoom bounds and tool tip when in
bounds
Merge pull request #13 from jonatkins/master

Pull from upstream.
Merge pull request #694 from enigmaquip/master

plugin draw resonator update
Merge remote-tracking branch 'upstream/master'
Minor typo.
Merge pull request #696 from nexushoratio/proofreading

Minor spelling correction.
Revert "Revert "Naive attempt to make bookmarks compatible with nav drawer. @ZasoGD - please have a look, if necessary undo this commit and do it right""

This reverts commit 67f273fd6d4b1db7d3ac2363305a1d30e3729ac4.
Merge pull request #697 from fkloft/bookmarks-pane

Mobile: Bookmarks in nav drawer
Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion
Improved intent sorting

(default app listed first again, sorting broke this)
new actionbar title for permalink
Improve build tools

- Makefile provides "locale" and "mobile" as targets. Mobile also installs and starts app
- build.py returns error code if ant fails
user-location: use circle by default, or arrow if device sends orientation events
Add hack circle to user-location
Make user location appear in layer chooser
user-location: hide hack circle on z < 16
Fix: location marker would be reset to circle when layer was toggled