mainfest pre merge
Merge branch 'master' of github.com:thijsh/HLP-
Merged
Google maps added