Merge branch 'release/2.2.5'

2.2.5 release
New ZendCon 2013 EU banner
Merge branch 'hotfix/zendconeu-banner' into develop