modify land page for newly authenticated users
resize and convert image  to png before uploading to database
merge changes from origin branch
added audience and theme field to event
some categories for events
some minor modifications
some more minor modifications to add_event view
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 pull request #95 from Konviser/master

resize and convert image to png before uploading to database
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 branch 'master' into deployment
Added a temporary AWS S3 bucket, to test settings and storage