Merge origin/master

Conflicts:
	.htaccess
	controller/index/C_Index.php
	index.php
	init.php
	model/M_City.php
	nbproject/project.xml
	trunk/componment/captcha/Com_Captcha.php
	trunk/componment/city/Com_City.php
	trunk/config/DB_config.php
	trunk/config/Router_config.php
	trunk/config/SMS_config.php
	trunk/config/Smarty_config.php
	trunk/config/Website_config.php
	trunk/core/C_Control.php
	trunk/core/Helper.class.php
	trunk/core/M_Model.pdo.php
	trunk/core/Orange.class.php
	trunk/function/F_Basic.php
	trunk/function/F_Cookie.php
	trunk/function/F_Network.php
	trunk/function/F_String.php
	trunk/library/L_SMS.class.php
	view/index.html