Add ship characteristics
Change mailer send address
Fix merge issues ahead of unholy union with master. SLAYER.
Tweak background grid and change form types.