Git update.
Git update.
Merge branch 'master' of https://github.com/rococori/AfterText

Conflicts:
	AfterText-server/out/production/AfterText-server/AfterTextServer$RequestHandler.class
	AfterText-server/out/production/AfterText-server/AfterTextServer.class