[MM] - pushing merged folder
Merge remote-tracking branch 'origin/dropbox' into maps
[MM,PS]{story} - modified MainActivity, MapActivity to handle GPS bundles
[MM,PS]{story} - finished gpstag transition between photo context menu and Google map
[KW,MS]{merge} - resolved merge conflicts.
[KW,MS]{merge} - resolved merge conflicts with maps branch.