Setup support for Android Studio Preview
Restored *.bak to .gitignore
Fixed output APK name to be the same as ADT
Forgot to delete old iml file
Fixed build not including src files.
Tried to recreate things.
Finally working and tested.  *blush*
Added proguard-project file back as building with it requires it.
Moved .gitignore changes to mobile/.gitignore
Forgot to move some settings in gitignores.
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.
Initial commit of a working Search View.
Reordered menu items.  IMO Layers is used more than My Location.
Removed menu selection handling for search due to double search.
some tweaks for the new search
* distinguish between onCreate intent and resume intent (do not always reload)
* handle voice search correct