Merge origin/master

Conflicts:
	src/main/java/ch/bfh/univoteverifier/gui/MainGUI.java