include resources
Merge remote-tracking branch 'kali/bug/include-resources' into develop