Some changes to the views on login
Merge branch 'master' of https://github.com/aV1rus/Capstone_Project

Conflicts:
	templates/base/base_home.html