map can now be displayed; started adding map navigation buttons
merging with karim
merging, problems with info.plist
still merging
Merge branch 'karim-emf-master'
still merging. problems with info.plis, maybe fixed
merged