Edit taking options
Corrected proposition update file
Merge dev into nrvnTesting