Bitrix 14.5.0
Bitrix 14.5.0
Merge branch 'master' of https://github.com/matiaspub/bxApiDocs

Conflicts:
	modules/forum/classes/general/functions.php
	modules/forum/classes/general/message.php
	modules/forum/classes/mysql/message.php
	modules/forum/mail/mail.php
	modules/im/bx_constants.php
	modules/im/classes/general/im_chat.php
	modules/im/classes/general/im_event.php
	modules/im/classes/general/im_history.php
	modules/im/classes/general/im_settings.php
	modules/im/include.php
	modules/mail/classes/general/mail.php
	modules/main/bx_constants.php
	modules/main/classes/general/checklist.php
	modules/main/classes/general/database.php
	modules/main/classes/general/main.php
	modules/main/classes/general/textparser.php
	modules/main/classes/general/usertype.php
	modules/main/classes/general/version.php
	modules/main/lib/data/appcachemanifest.php
	modules/main/lib/db/connection.php
	modules/main/lib/db/mssqlconnection.php
	modules/main/lib/db/oracleconnection.php
	modules/main/lib/entity/datamanager.php
	modules/main/lib/entity/query.php
	modules/main/lib/io/path.php
	modules/main/lib/page/frame.php
	modules/main/lib/urlrewriter.php
	modules/main/tools.php
	modules/mobileapp/classes/general/interface.php
	modules/pull/ajax_hit.php
	modules/pull/classes/general/pull_options.php
	modules/security/classes/general/filter.php
	modules/security/classes/general/tests/site_configuration.php
	modules/security/classes/general/tests/tests_package.php
	modules/security/include.php
	modules/socialnetwork/classes/general/log_rights.php
	modules/socialnetwork/classes/general/log_tools.php
	modules/socialnetwork/classes/general/user_group.php
Resolve conflicts