Merge pull request #1 from pimcore/master

update
PIMCORE-2467 Added dropAreaHeight to image tag
[PIMCORE-2467] Added 'defautHeight' to image tag
Merge pull request #112 from timhonders/image-100

[PIMCORE-2467] Added 'defautHeight' to image tag