Modify

Modify a little
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Add_Item.java
	src/ExtractFromParse.java
	src/ItemSort.java
	src/Pos_Display.java
change