[솔] - 커밋
Merge branch 'master' of github.com:BaeFlower/everybuddi

Conflicts:
	everybuddi/.idea/workspace.xml
	everybuddi/apps/events.py
	everybuddi/apps/events.pyc
	everybuddi/apps/forms.py
	everybuddi/apps/templates/events/events.html
	everybuddi/apps/templates/events/events_create.html