merge recibido
TRATADNODO CON ESTO
ARREGLANDO
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/META-INF/persistence.xml
	src/com/deevo/java/server/model/dao/LogIndao.java
aaassshhh
Merge branch 'master' of git://github.com/DeEvo/deevo
asdasd