General commit
Merge remote-tracking branch 'origin-carlomagno/master'

Conflicts:
	FlaggerFight/src/com/us/flaggerfight/ThreadRecibe.java
lol