did a lot of stuff
added location-landingipage
Merge branch 'locations'