Krystian commit
Merge branch 'master' of https://github.com/kpowojski/PKRY_EV

Conflicts:
	bin/election_authority/Constants.class