pop (rock)
Merge origin/master

Conflicts:
	code/ZRTCclient/src/main/java/fenetre/Window.java
Merge origin/master
update client