git to cpp tango server

Conflicts:
	applications/tango