+ test
Finish assets
+--
Merge branch 'master' into develop

Conflicts:
	src/com/VotingSystem/ui/A.java
Merge branch 'develop'