Merge branch 'hotfix/20141212-block01' into develop
Merge branch 'hotfix/20141216-xlegend' into develop
Merge branch 'hotfix/20141216-minecraft' into develop
Merge branch 'hotfix/20141216-cg' into develop
Merge branch 'hotfix/20141216-inmu' into develop
Merge branch 'hotfix/20141216-mc2' into develop
Merge branch 'hotfix/20141216-xn' into develop
Merge branch 'hotfix/20141216-applibot' into develop
p-world
Merge branch 'develop'