added functionality for searching for tenant
test
minor changes
Merge branch 'master' of heroku.com:polar-sierra-6394

Conflicts:
	app/controllers/properties_controller.rb
	config/routes.rb
commit
commit
commit

commit
screen3
Merge branch 'master' of https://git.heroku.com/polar-sierra-6394

Conflicts:
	.idea/dataSources.xml
figaro and fog
figaro and fog
figaro and fog
figaro and fog
no scroll screens
no scroll screens
no scroll screens
no scroll screens
correct typo in uploader
correct typo in uploader