Hopefully fix #74
Close #74
Formatting changes
Documentation
Merge branch 'master' of https://www.github.com/danrschlosser/eventum into eventslug

Conflicts:
	app/lib/regex.py
Merge pull request #107 from alanhdu/eventslug

Eventslug
Add slides for Android talk
Merge pull request #126 from parthibanloganathan/master

Add slides for Android talk to resources
Issue #113, split json_response into json_response_string and json_response_dict and changed fucntion calls in auth.py