style cleanup
Added Invoice generator functionality
Merge branch 'ddm_dev' into merge2

Conflicts:
	java/src/main/java/Sty.java
fixing merge confilcts
Merge remote-tracking branch 'master' into merge2

Conflicts:
	java/src/main/java/Sty.java
Merge branch 'merge2'