bla
Merge branch 'master' of https://github.com/achanehive/cocinela

Conflicts:
	api/cocinela-parent/cocinela-web/src/main/java/com/orange/cocinela/web/page/campaign/CampaignPage.java