Merge branch 'hotfix_ln'
bzk_html uploadscript to accept new format
Merge branch 'hotfix_new_bzk_upload_format' into dev