testcommit
Merge remote-tracking branch 'origin/master'v

vConflicts:
	SignUpPage.pyc