Changed final static variables to private
Merge remote-tracking branch 'github/master'

Conflicts:
	src/com/company/XLSReportGenerator.java
Changed final static values to private