change view categories
Merge branch 'master' into ivan
change eclipse component
Merge branch 'master' into ivan
relocate admin pages
set to list
add subjects
Merge branch 'master' into ivan
change subjects page in admin
add language, no users
add relocation and users
ff
merge vs mater