Merge branch 'master' of https://github.com/terre-virtuelle/navisu

Conflicts:
	navisu-app/src/main/java/bzh/terrevirtuelle/navisu/app/guiagent/impl/GuiAgentImpl.java