merge maser
add localization in admin page
pull master
merge with master
Merge branch 'master' into vetall1