Add: sort hashmap
Add: sort hashmap
Merge origin/master

Conflicts:
	nbproject/project.properties
	web/response.jsp