All coding finished.
Merge branch 'master' of github.com:fnmartinez/Jabxy

Conflicts:
	src/main/java/ar/edu/itba/it/pdc/jabxy/Jabxy.java
	src/main/java/ar/edu/itba/it/pdc/jabxy/model/JabxyHandler.java
	src/main/java/ar/edu/itba/it/pdc/jabxy/network/handler/ServerHandlerAdapter.java