cleanup merge

created develop branch from outdated master then merging autoclave to develop so then it could be base for develop-x branches taken from live systems on production from blocktrades and gtg

added 2 commits

• e4ac227c - 1 commit from branch develop
• e518992c - Merge branch 'develop' into 'autoclave'

Compare with previous version

merged

mentioned in commit 710d2521