Added contact/location, screenshots; fixed various bugs
Merge pull request #1 from maxbaeumle/master

Added contact/location, screenshots; fixed various bugs