test version for step 1 auth
Merge remote-tracking branch 'origin/master'

Conflicts:
	basic/StatusMachine.py