config of eng.local
restore config of master.eng
proudct applicaton can be add , modify
embed application into product form
meta for application
application in front
modify comment of application in list of metatitle
application apply on product cate

Conflicts:
	.htaccess
	conf/config.auth.php
link type of product in application
indicate true as calling application_checkbox in produect cate form in cmsadmin
detect product img in application  is product or cate
update application for more detail process
modify application for using app block to place app cate
product application on products

Conflicts:
	conf/config.auth.php
rewrite rule for application pagination and class of pagination table

Conflicts:
	templates/ws-products-tpl.html
new word application which apply in default-item, and other words which are product search and enter keyword in lang files

Conflicts:
	conf/default-items.php
	lang/chs-utf8.php
	lang/cht-utf8.php
	lang/fre-utf8.php
	lang/ger-utf8.php
	lang/ind-utf8.php
	lang/jap-utf8.php
	lang/kor-utf8.php
	lang/por-utf8.php
	lang/rus-utf8.php
	lang/spa-utf8.php
	lang/tur-utf8.php
Merge branch 'eng.local' into master.eng
移除get_max_sort_value直接return 0
Merge branch 'eng.local' into master.eng
Merge branch 'master.eng' into cht

Conflicts:
	lang/cht-utf8.php