Revert "Merge branch 'moises'"

This reverts commit 34cdf4188874ccbdef686c5ef27a0d7e2c2cd390, reversing
changes made to dcf4c618813f0fc1b3834be0b26c4b271c3fc2ee.
Merge branch 'master' into moises

Conflicts:
	src/quakeagent/QuakeAgent.java
- Terminando de arreglar autocagadas (moi).