small changes (from master)

Conflicts:
	prog/README.md
	prog/mdiis.h
	web/js/rism_lmv.js
	web/js/rism_mdiis.js
OO style lmv.h (other commits from master)

Conflicts:
	prog/lmv.h
	prog/mdiis.h
	prog/rism0.c
	web/js/rism_basic.js
	web/js/rism_lmv.js
	web/js/rism_mdiis.js
	web/js/rism_model.js
	web/js/rism_uv.js