Merge branch 'master' of https://github.com/LB-Simplexity/composite-operations

Conflicts:
	client/src/com/simplexity/launch/Main.java
Merge branch 'master' of https://github.com/LB-Simplexity/composite-operations

Conflicts:
	client/src/com/simplexity/launch/Main.java