Merge branch 'feature/scan-button-inside-input' of github.com:jesstelford/wallet-sweep into feature/scan-button-inside-input

Conflicts:
	public/css/main.css