added new husky version
added option for diplay options
fixed typos
added default display option and display options param to content tyoe
fixed recursive merge for array
added changelog
added new husky version and build new admin version
Merge pull request #536 from sulu-cmf/feature/configurable-display-options

Addded configurable display options
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into bugfix/single-internal-lin
fixed changelog