++ Printing part 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/java/model/beans/InvoiceBean.java