Finally a somewhat-functional dialog for merging prom notes
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel