Merge origin/master

Conflicts:
	src/Communications/FilterListener.java
Merge origin/master
Merge origin/master

Conflicts:
	src/Communications/FilterListener.java
Merge origin/master