bla
Merge branch 'master' of https://github.com/arti1011/Eb

Conflicts:
	party/src/main/resources/sql/create.sql