Merge branch 'master' into languagev2

Conflicts:
	sources/appsgate-project/appsgate-context/pom.xml

sources/appsgate-project/communication-components/AppsGate/src/main/java
/appsgate/lig/main/impl/Appsgate.java