added buggy mapview
fixed navagation
got location to work
concisely redefined the .gitignore file to suit our needs
merged master into Feng
bookkeeping