event test
test
push
test
Merge remote-tracking branch 'origin/master'

Conflicts:
	service/src/test/java/com/goparty/client/UserAndEventTest.java