Merge master/master

Conflicts:
	lumens-connector-txt/src/main/java/com/lumens/connector/txt/TextClient.java