Merge branch 'release/img-fix'
Merge branch 'release/sponsor-talks'
Merge branch 'release/rcal'
Merge branch 'release/r16'
Merge branch 'master' of github.com:webBoxio/codefront.io-2014
scroll spy fix
Merge branch 'hotfix/scroll-spy-fix' into develop