Last version from server
Merge branch 'master' of github.com:jhekasoft/jhekasoft

Conflicts:
	.gitignore
	autoload_classmap.php
	composer.json
	config/application.config.php
	vendor/stroker/cache/src/StrokerCache/Controller/CacheController.php