Bug fixes
Merge branch 'master' of https://github.com/hshaheucleia/web-demo

Conflicts:
	demo/settings.py
	demo/templates/edu/my_applications.html