added a require for the resource files
Merge branch 'mantis-149' into dev
Merge branch 'dev'