remove infinite loop when the other aborts
Merge branch 'master' of https://github.com/Duolasa/PADI2014

Conflicts:
	Projecto/DataServer/DataServer.cs