Fixes to conditional navigation methods (still work to do there because not all data objects are updated).  Addition of items surrounding adding attachments to proposals. Lots more work to do, yet.
Changes brought in from Abe Heward