fixed ticket 2895 and cleaned up admin/resource/text a little
Merge pull request #361 from igal-getrailo/jira-2895

fixed ticket 2895 and cleaned up admin/resource/text a little