Merge branch 'hotfix/20140529-pong'
Code of Joker
Merge branch 'hotfix/20140529-coj-agentlabo' into develop