for server test
Merge branch 'master' of https://github.com/onlycesc/HCI_Project.git

Conflicts:
	src/main/java/org/nhnnext/support/FileUploader.java