disable button when clicked, add threshold option
Merge commit 'e99d20785b4255c8e42ff51fe04e51c1bbbcc3f1'

Conflicts:
	web-app/js/main.js