Control Panel: custom block edit form changed. Wrapper list changed and now based on list of tpl-files that placed inside subdirectory of directory blocks.
Merge remote-tracking branch 'origin/1.1.5' into 1.1.5