Added core to info file
Fixed filename after shift to a feature module
Merge branch 'development'