Merged AndEngine branch with Eric's uncommitted master