delete classes not user
sprint dao config
persistence
inclusion in sql
Merge branch 'develop' of https://github.com/telefonicaid/fiware-paas into feature/integrationwithopenstackservergroups_38

Conflicts:
	migrations/src/main/resources/db-changelog.sql
affinity change to generate the payload
update the affinity property
add new appenders
modify userdata: add puppet config and modify chef-client;
Merge pull request #43 from jesuspg/feature/34_logback

appenders;userdata
Merge pull request #41 from hmunfru/feature/integrationwithopenstackservergroups_38

Feature/integrationwithopenstackservergroups 38
Merge branch 'develop' into issue/24_jetty

* develop:
  add new appenders modify userdata: add puppet config and modify chef-client;
  update the affinity property
  affinity change to generate the payload
  inclusion in sql
  persistence
  sprint dao config
  delete classes not user