Merge branch 'release/r5'
Merge branch 'release/r12'
Merge branch 'master' of github.com:webBoxio/codefront.io-2014
bold fixes + news added
Merge branch 'hotfix/hf8' into develop