All working
sda
Merge branch 'master' of https://github.com/johntk/JAKD

Conflicts:
	src/reports/Calender.java
	src/reports/QuartReports.java
Merge branch 'master' of https://github.com/johntk/JAKD