+----
Merge branch 'master' into develop

Conflicts:
	src/com/VotingSystem/ui/A.java