more assets
Merge branch 'master' of https://github.com/holon000/holon-dashboard

Conflicts:
	assets/linker/styles/style.css