debug bat
Merge branch 'master' of https://github.com/creativ/TechTeam.git

Conflicts:
	TechTeam/main/views/main_views.pyc