Merge branch 'release/2.1.3100'
2.2.0 release
Finish 2.3.0
Finish 2.3.1
Rearrange class methods
Update to Jublo IT Solutions, update year
Merge branch 'master'

Conflicts:
	classes/connector.mysql.class.php
	classes/connector.mysql.easy.class.php
	classes/connector.mysqli.class.php
	classes/monty.class.php
	composer.json