update data adapter for order
fin javadoc
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/order.txt
	data/table.txt