Added location
Merge branch 'servlet' of https://github.com/Blue-Motion/Crime-o-Meter into servlet

Conflicts:
	Crime-o-Meter/bin/rug/netcom/crimemeter/server/database/Mysqldriver.class
	Crime-o-Meter/bin/rug/netcom/crimemeter/server/socket/TCPServerThread.class