Concept Array Implementation (intermediate devs)
Merge branch 'master' of github.com:culturecommunication/ginco
Merge branch 'master' of github.com:culturecommunication/ginco
Concept Array Implementation (intermediate devs)
Merge branch 'master' of github.com:culturecommunication/ginco
Merge branch 'master' into US40
Merge branch 'master' of github.com:culturecommunication/ginco
Merge branch 'master' into US40
Concept Array Implementation (intermediate devs)
Merge branch 'master' of github.com:culturecommunication/ginco
Merge branch 'master' into US40

Conflicts:
	ginco-admin/src/main/java/fr/mcc/ginco/extjs/view/pojo/NodeLabelView.java
	ginco-api/src/main/java/fr/mcc/ginco/dao/INodeLabelDAO.java