taesoo
Merge branch 'master' of https://github.com/Cocktailor/server

Conflicts:
	manage.py