Some fixes
Merge all

Conflicts:
	index.html
	js/main.js
Work with eclipse
fixed add Item