update
update
Merge 1.0.0.060a

Conflicts:
	src/main/webapp/functional.html
	src/main/webapp/index.html
	src/main/webapp/js/emos.js
Merge 1.0.0.060a

Conflicts:
	src/main/webapp/functional.html
	src/main/webapp/index.html
	src/main/webapp/js/emos.js
update
update