ehm..commit in order to sync with "final"
Merge branch 'master' of https://github.com/ss-proto/ss-proto

Conflicts:
	app/controller/SelfScanning.js
	index.html