add BoostCakeHtml::image() for holder.js
fixed CONFLICT
Merge commit 'b13b9d3ac9458d78822931c1ff6e9bc07548f4b6'