is form plus edit form
Merge remote branch 'origin/master'

Conflicts:
	src/gui/CenterPanel.java
	src/gui/panels/extra/AddEntryPanel.java