Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/groovy/com/soulsys/g_serv/test/TestApp.groovy