Getting my hand back into this
Merge branch 'dev' of github.com:lienma/UpsBoard into dev

Conflicts:
	package.json
	upsboard.js