Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/VotingSystem.jnlp
	src/org/univer/voting/control/AddUserController.java
	src/org/univer/voting/control/SignInController.java
Merge remote-tracking branch 'origin/master'