just an api update, nothing at all
Merge, and fixed totals area display

Conflicts:
	src/com/nistica/panels/OrderDialog.java
Updated text area
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/nistica/panels/OrderDialog.java