Merge pull request #49 from SmokyBob/feature/material_design

App Refactoring
Correctly reload the Map when coming back from other controllers