Sincronização
Merge origin/master

Conflicts:
	application/.htaccess
	application/config/config.php
	application/config/database.php
	application/config/routes.php
	system/.htaccess
	system/core/Common.php
	system/core/Config.php
	system/core/Input.php
	system/core/Security.php
	system/database/drivers/pdo/pdo_driver.php
	system/database/drivers/sqlsrv/sqlsrv_driver.php
	system/helpers/download_helper.php
	system/helpers/file_helper.php
	system/helpers/text_helper.php
	system/language/english/ftp_lang.php
	system/libraries/Ftp.php
	user_guide/changelog.html
	user_guide/database/active_record.html
Merge origin/master

Conflicts:
	application/.htaccess
	application/config/config.php
	application/config/database.php
	application/config/routes.php
	system/.htaccess
	system/core/Common.php
	system/core/Config.php
	system/core/Input.php
	system/core/Security.php
	system/database/drivers/pdo/pdo_driver.php
	system/database/drivers/sqlsrv/sqlsrv_driver.php
	system/helpers/download_helper.php
	system/helpers/file_helper.php
	system/helpers/text_helper.php
	system/language/english/ftp_lang.php
	system/libraries/Ftp.php
	user_guide/changelog.html
	user_guide/database/active_record.html