Merge branch 'hotfix/hf6'
Merge branch 'release/r10'
some sponsor updates
Merge branch 'hotfix/hf7'
Merge branch 'hotfix/hf7' into develop
update / conflict fix
Merge branch 'release/r11'
Merge branch 'master' of github.com:webBoxio/codefront.io-2014
update / bio fix / breaks fix