Changed bower prject name kiosk-demo
Merge remote-tracking branch 'origin' into kiosk-demo
merged alpha0.8
Merge remote-tracking branch 'origin/gh-pages' into kiosk-demo

Conflicts:
	kiosk-demo.html
updated less
Merge pull request #5 from touhonoob/gh-pages

kiosk-demo updated