use self::DEFUNCT_NO replace hardcode
add user permission edit for admin
Merge remote-tracking branch 'upstream/master' into i18n

Conflicts:
	application/classes/Controller/User.php
	application/views/contest/header.php
	application/views/problem/list.php
	application/views/problem/submit.php
Merge branch 'freefcw'
Merge branch 'i18n'