Changed BaseTemplate.html to get the project id and team id
Merge branch 'master' of https://github.com/AutomationSolutionz/Framework_0.1

Conflicts:
	Automationz/Framework_0.1/DjangoFramework/MySite/templates/BaseTemplate.html
Changed the setting to get the project setting and team id