Working two way qrcodes
Fully integrated in QRCode->Onion->HTTPKEY URL code
Merge remote-tracking branch 'upstream/master'

Conflicts:
	web/src/js/controllers.js