последние исправления
Игнор
Merge branch 'master' of https://github.com/Stelss0007/Callisto

Conflicts:
	nbproject/private/private.xml
Отправка смс
Merge branch 'master' of https://github.com/Stelss0007/Callisto
Merge branch 'master' of https://github.com/Stelss0007/Callisto

Conflicts:
	www/.htaccess
	www/lib/ErrorHandler/ErrorHandler.class.php
	www/modules/test/index.php
update utf8