Merge branch 'master' of H:\Web-Programming\Python\Project\Prexter with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/admin/audience.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/admin/audience.html
V14
Merge remote-tracking branch 'origin/master'

Conflicts:
	MainAPP/urls/adminUrls.py
	templates/admin/User.html
V15