....
BE
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/Presentation/MainFrame.form
	src/Presentation/MainFrame.java