stian loactino update
Merge branch 'master' of https://github.com/stianwestvig/OpsReceiver
stian added location to view