Updated transaction fee with tip

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