Added cancel facility
Merge branch 'master' of github.com:nkp/bitbump

Conflicts:
	android/www/js/index.js