Fixed resource editing
Merge branch 'dev'