Merge branch 'hotfix/20140916-mobafire'
oroti
Merge branch 'hotfix/20140916-oroti' into develop