Restruturacion del proyecto
Merge branch 'master' of https://github.com/alexsilva92/teconvido

Conflicts:
	TeConvidoServer/src/com/teconvido/server/Server.java
	TeConvidoServer/src/com/teconvido/server/TaskManager.java