fixed images overflow in file magager
layout changes
fixed merging
Merge branch 'develop' of ssh://github.com/anton-tsyganenko/wolfcms into develop