Merge origin/master

Conflicts:
	Applets/src/search/SearchApplet.java
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	Applets/src/search/SearchApplet.java
Merge origin/master