branch behind
Merge branch 'master' of https://github.com/mtarsel/dream-girlz

Conflicts:
	student_portal/models.py
added package libmysqlclient-dev to INSTALL.sh