Updates
Merge from hassy-master
Merge remote branch 'aliss/master'

Conflicts:
	css/style.css
	index.html
	js/gapp.js
Fix for Print Selected