Changes to core and resource files
Merge branch 'master' of https://github.com/palistov/neutral