Merge origin/master

Conflicts:
	src/Presentation/Frames/MainFrame.java
Merge origin/master