Merge origin/master

Conflicts:
	RevolutionnaryBot/src/revolutionnarybot/RevolutionnaryBot.java
merge fix
Merge origin/develop into develop

Conflicts:
	FinalVersion/src/main/java/com/mycompany/finalversion/main.java