Please look at comments beside codes

edited certain lines
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/java/models/ItemManager.java