version 1 bootstrap
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	MainAPP/urls/adminUrls.py
	MainAPP/views/adminViews.py
	templates/admin/AddCategory.html
	templates/admin/Category.html
	templates/admin/audience.html
version 2