great refactoring. added dist builder
css temporary fix
css
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	demo/preload.js