add optional referal method field to step-2 of registration
Merge remote-tracking branch 'upstream/master'

Conflicts:
	node/src/main/routers/join.js