Updated UI
Merge branch 'master' of https://github.com/hharchani/CRElection

Conflicts:
	index.php
Updated UI and some fixes