edit productline
Merge remote branch 'upstream/master'

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

Conflicts:
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/ModelConstants.java
	apis/api-web/api-web-fo-mcommerce/src/main/java/org/hoteia/qalingo/web/mvc/controller/catalog/ProductLineController.java
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
Get RootCatalogCategories in ProductLineController
merger from git
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
Define loading Brands of category
Merge remote-tracking branch 'upstream/master'
sort + pagination + order product_line
Merge remote branch 'upstream/master'

Conflicts:
	apis/api-core/api-core-common/src/main/java/org/hoteia/qalingo/core/web/mvc/factory/impl/ViewBeanFactoryImpl.java
	apis/api-web/api-web-fo-mcommerce/src/main/java/org/hoteia/qalingo/web/mvc/controller/catalog/ProductLineController.java
sort + pagination product line
Merge pull request #2 from baotran109/master

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

fix sort + order by
side bar category + brand product