PEP 8
Merge remote-tracking branch 'origin/master'

Conflicts:
	object/velocity_login.py