mention about requirements.txt and pip in docs
Merge branch 'master' into upgrade

Conflicts:
	djnro/templates/registration/login.html
	edumanage/views.py