Add resources folder
Merge remote-tracking branch 'origin/development' into refactortrees
fixing glitches