Merge branch 'hotfix/20140521-faviconok'
ws-tcg
Merge branch 'hotfix/20140521-ws' into develop