v1.5.1
Merge branch 'master' of https://github.com/hihiboxhbtv/hihiboxhbtv.github.io

Conflicts:
	core/css/hihibox.css
	core/js/hihibox.js
	core/js/iconlist.js