Adding user keys so user can log into console separate from controller
Merge remote-tracking branch 'origin/userEncryption' into discovery

Conflicts:
	ndn_pi/iot_console.py
	ndn_pi/iot_controller.py
Going to add user configuration of gateway
Making config utility more GUI
Going to remove pin entry; have gateway display a sign to confirm pairing