Merge pull request #254 from thriuin/master

Fixes for JIRA  335, 372
fix for xls resources and unified_resource_formats madness
Merge pull request #255 from wardi/master

fix for xls resources issue