Fixed file download issue
Merge branch 'master' of https://github.com/securet/ASM.git

Conflicts:
	asm/develop/WebContent/WEB-INF/classes/com/securet/ssm/services/reports/ReportsService.class
	asm/develop/src/com/securet/ssm/services/reports/ReportsService.java
Reverted client user change