Merge branch 'hotfix/refactor-20141012'
fix AOJ language resolver to support Python2/3
Merge branch 'hotfix/0.2.4' into develop