25.02.12
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/modules/nomination/Block/AdminNomination/Edit.php