Merge origin/Taxi_Server into Taxi_Server

Conflicts:
	nbproject/project.properties