aaa
Merge branch 'master' of https://github.com/sokoban/netscan_server

Conflicts:
	target/maven-archiver/pom.properties
	target/netscan_server.war
	target/surefire-reports/TEST-com.sokoban.project.controller.ThumbnailTest.xml
	target/surefire-reports/com.sokoban.project.controller.ThumbnailTest.txt
	target/surefire/surefire919330154474730669tmp