update to include the disallocate floatingip, introduction of floating ip in
the tierinstance
Merge branch 'develop' of https://github.com/telefonicaid/fiware-paas into bug/removefloatingips_38

Conflicts:
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/claudia/impl/ClaudiaClientOpenStackImpl.java
solve the merge errors
coments about pr
Merge pull request #39 from hmunfru/bug/removefloatingips_38

Bug/removefloatingips 38
Merge branch 'develop' into issue/24_jetty

* develop:
  coments about pr
  solve the merge errors
  update to include the disallocate floatingip, introduction of floating ip in the tierinstance