Rearranged project structure
Merge branch 'master' of https://github.com/alexandrelucchesi/tr2-final

Conflicts:
	tr2-server-sync/src/tr2/server/sync/Main.java
	tr2-server-sync/src/tr2/server/sync/controller/Controller.java