changes to handler and server.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/src/database/SmartPark.java
	Server/src/server/Handler.java
Merge remote-tracking branch 'origin/master'