Merge origin/master
Merge origin/master

Conflicts:
	Main.java/src/main/MainJava.java