added audience and theme field to event
some categories for events
added audience and theme to form, update doesnt work yet
merging with master changes
optimized wording
categories now actually update on edit
checkboxes slightly less of a eye sore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	web/views/events.py
Merge pull request #99 from ercchy/master

Merging alja's changes with resolved conflict
Fixed issue when geoip can't returns None for the users location
forgot a debug print *blush*
Merging because automerge failed
Merge pull request #100 from goranche/master

Fixed issue when geoip returns None for the users location
select existing audience and theme choices got lost in merge
Merge pull request #101 from ialja/master

select existing audience and theme choices got lost in merge
loading default event categories with a datamigration

... and removing fixtures. Who needs fixtures when you have data migrations, eh?
fixing bootstrap social imports on sass
Merge pull request #103 from ercchy/master

fixing bootstrap social imports on sass
slightly better looking add event form

Or so I like to think.
Merge remote-tracking branch 'upstream/master'