clean-up
Merge branch 'master' of https://github.com/vvgaming/HarMegido.git

Conflicts:
	HarMegidoAndroid/src/org/vvgaming/harmegido/uos/ServerDriverFacade.java
Merge branch 'master' of https://github.com/vvgaming/HarMegido.git
trocando a lib do uos core e colocando a dependencia do gson