Added ability to switch between table and map view
Merge remote-tracking branch 'github/master' into master1