20140922
Merge remote-tracking branch 'javarpg/master'
rm