Fixed res folder being excluded from build path
Merge remote-tracking branch 'origin/master'