Control
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/election.php
	application/views/auth/account.php
	application/views/election/create_election.php
	application/views/election/election_index.php
Merge branch 'master' of https://github.com/ccf0056/VUNT

Conflicts:
	application/models/ion_auth_model.php