added better error handeling for the user
Merge branch 'master' of https://github.com/puffball/freebeer

Conflicts:
	js/everybit/src/icxdisplay.js