Fix issue with rendering the correct URL's for locations.
Merge branch 'master' of https://github.com/Maikenvv/front-end-development-2

Conflicts:
	js/app.js
Merge pull request #1 from rovansteen/master

Fix voor de foute URL