Add crash detection to main app
Merge branch 'master' of http://github.com/LyfeCycle/map-app
Merging Crash stuff in
Fixed merge, keep all kevin's changes