Добавлены библиотеки
Merge branch 'master' of https://github.com/GoDr/lotos-cms

Conflicts:
	includes/joostina.php