category side bar
Merge remote-tracking branch 'upstream/master'

Conflicts:
	apis/api-web/api-web-fo-mcommerce/src/main/java/org/hoteia/qalingo/web/mvc/controller/catalog/ProductLineController.java
merge 16/12/2013
Merge remote-tracking branch 'upstream/master'

Conflicts:
	apis/api-core/api-core-common-web-fo/src/main/java/org/hoteia/qalingo/core/web/mvc/factory/FrontofficeViewBeanFactory.java
	apis/api-core/api-core-common-web-fo/src/main/java/org/hoteia/qalingo/core/web/mvc/factory/impl/FrontofficeViewBeanFactoryImpl.java
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/dao/impl/CatalogCategoryDaoImpl.java
	apis/api-web/api-web-fo-mcommerce/src/main/java/org/hoteia/qalingo/web/mvc/controller/catalog/ProductLineController.java
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from baotran109/master

sort + pagination product line
Merge pull request #3 from baotran109/master

fix sort + order by
side bar category + brand product
Merge pull request #4 from nkphuong/master

sidebar category + brandProduct
Merged and Fixed: ProductLine, ProductAxe
Merge remote branch 'upstream/master'

Conflicts:
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/domain/CatalogCategoryVirtual.java
	apis/api-web/api-web-fo-mcommerce/src/main/java/org/hoteia/qalingo/web/mvc/controller/catalog/ProductLineController.java