QC-481 Fix bug login email error 500 when login email not set password yet
Merge branch 'develop' of github.com:minhuyen/intoidi into develop

Conflicts:
	bootstrap.sh
	requirements.txt
Setup evironment #1