new interface
Merge branch 'master' of github.com:larsendt/xhab-gui

Conflicts:
	rails/app/views/spots/index.html.erb