Updated AdvancedMessage, this class now contains a Base that is used to store settings that apply to all parts
Merge branch 'ferrybig'