messing up stuff
Merge branch 'master' of https://github.com/notenoughdata/harbor

Conflicts:
	app/views/lease/index.html.erb