Merge branch 'master' of https://github.com/utopszkij/elovalasztok

Conflicts:
	components/com_candidates/views/candidates/tmpl/vote.php
Merge branch 'master' of https://github.com/utopszkij/elovalasztok

Conflicts:
	components/com_candidates/views/candidates/tmpl/vote.php