Merge branch 'master' of https://github.com/devteamSE/SE-Team

Conflicts:
	templates/base.html