updated views
Merge branch 'prototypes' of github.com:openforis/calc into prototypes

Conflicts:
	design/db/postgres/views.sql