mini merge
mini merge
add
admin authorizations to users and hotspots contollers, added hotspot links to find_me page