Merge remote-tracking branch 'another/master'

Conflicts:
	.gitmodules
	classes/Error.class.php
	initial.php
	library/kint
Merge remote-tracking branch 'another/master'

Conflicts:
	.gitmodules
	classes/Error.class.php
	initial.php
	library/kint