changed bootstrap theme
mini surveys from events
Merge branch 'master' of github.com:yeleman/douentza

Conflicts:
	douentza/admin.py
	douentza/views/events.py