postgres error
Merge branch 'master' of github.com:optemino/rent-analysis

Conflicts:
	wsgi/web2py/applications/rent/databases/sql.log
	wsgi/web2py/applications/rent/databases/storage.sqlite
	wsgi/web2py/applications/rent/private/app.log
	wsgi/web2py/applications/rent/private/app.log.1
	wsgi/web2py/applications/rent/private/app.log.2
	wsgi/web2py/httpserver.log
	wsgi/web2py/httpserver.pid
	wsgi/web2py/parameters_8000.py
done merge