Merge upstream/master

Conflicts:
	src/ui/MainWindow.java
Merge upstream/master
merge, partial update to addnotecommand
fix merge