Added Files - changes to admin interface
Merge branch 'master' of https://github.com/hshaheucleia/web-demo

Conflicts:
	demo/templates/admin/auth/user/change_password.html
	demo/templates/admin/base.html
	demo/templates/base.html
	demo/templates/registration/password_change_done.html
	demo/templates/registration/password_change_form.html
	demo/templates/registration/password_reset_complete.html
	demo/templates/registration/password_reset_confirm.html
	demo/templates/registration/password_reset_done.html
	demo/templates/registration/password_reset_form.html
	edu/admin.py