GUI modifications etc..
Merge branch 'infinity' of ssh://git@github.com/tubav/fiteagle.git into
infinity

Conflicts:
	clients/xipiClient/src/main/resources/searchInfrastructuresResponse.json
merge
merge
merge