Register another Glass
Leave word unaffected by encode/decode error if an error happens
Merge branch 'crop-picture' of https://github.com/scottgwald/wear-connect into test
Tags with fixed ratios
Tag thumbs ratios are also fixed
Scrolling tags with mouse wheel
Shift+Control resume image stream
Merge remote-tracking branch 'origin/test'

Conflicts:
	glassprov_server.py
	js/cropper.js