merge from 0.4.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	class/Module/Banner/config.php
	class/Module/Catalog/Controller/CatalogController.php
	class/Module/Catalog/Controller/GalleryController.php
	class/Module/Catalog/Controller/GoodsController.php
	class/Module/Catalog/Controller/ProdtypeController.php
	class/Module/Catalog/Model/CatalogModel.php
	class/Module/Catalog/Model/FieldModel.php
	class/Module/Catalog/config.php
	class/Module/Page/Model/PageModel.php
	class/Sfcms/Data/Relation/Belongs.php
	class/Sfcms/Data/Relation/Many.php
	class/Sfcms/Kernel/Base.php
	class/data/object/catalog.php
	class/data/object/productfield.php
	class/data/object/productproperty.php
	class/data/object/producttype.php
	class/data/relation.php
	class/data/relation/one.php
	class/data/table/catalog.php
	class/data/table/cataloggallery.php
	class/data/table/productfield.php
	class/data/table/productproperty.php
	class/data/table/producttype.php
	class/model/module.php
	class/model/productproperty.php
	class/model/producttype.php
	class/sfcms/session.php
	misc/module/behavior.js
	misc/module/siteforever.js
	protected/config/development.php
	test/RouterTest.php
	test/sfcms/controller/Sfcms_Controller_ResolverTest.php
	widgets/function.head.php