Merge branch 'dev-activity-faw' of http://gitlab.afanticar.com:13140/java-ms/afanti-open-api into uat

 Conflicts:
	src/main/java/com/afanticar/afantiopenapi/config/TokenInterceptor.java