add psd support
fix merge conflicts
Merge pull request #23 from sulu-cmf/feature/psd-support

[FEATURE] add psd support