Removed duplicate key in en.xml
fixed approval bug
follow up
fixed cmake
More stuff for update form
Merge branch 'master' into updater
finished updater rewrite