adding locations display to edit page
Merge branch 'master' of https://github.com/hack4reno2013/govoutside