wifi activity view
Merge branch 'surroundings'

Conflicts:
	app/assets/stylesheets/wifi.css