change Content-Disposition to attachment
Merge branch 'master' of https://github.com/Weerawit/onion.git

Conflicts:
	pom.xml