Merge origin/master

Conflicts:
	src/Presentation/Frames/MainFrame.java

Enter Login
Merge origin/master