Location adding, route for location view

Got both of them working, go me!
Merge branch 'parent-master'
Merge branch 'master' into parent-master