Merge branch 'atlanticscrap-0.1' into develop
general changes insettings for all branches
atlantic scrap launch
Merge branch 'atlanticsteel-0.1' into atlanticscrap-0.1