fix bug when admin token is invalid; the solution is create new token;
add unit test;
remove comments initdb
Merge pull request #32 from jesuspg/bug/28_restart_keystone

Error authenticating after restart keystone
Merge branch 'develop' of https://github.com/telefonicaid/fiware-paas into issues/introductionoffederatednetworks_20

Conflicts:
	rest-api/src/main/java/com/telefonica/euro_iaas/paasmanager/rest/auth/OpenStackAuthenticationProvider.java
Merge pull request #30 from hmunfru/issues/introductionoffederatednetworks_20

Issues/introductionoffederatednetworks 20
fix bug: add vdc at the end of hostname in tierinstance
add new method to generate the name
modify unit test and integration test
Merge pull request #33 from jesuspg/bug/27_node_names

fix bug: add vdc at the end of hostname in tierinstance
Merge branch 'develop' of https://github.com/telefonicaid/fiware-paas into issues/introductionofcloudinit_31

Conflicts:
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/bootstrap/InitDbBootstrap.java
	core/src/main/java/com/telefonica/euro_iaas/paasmanager/manager/impl/InfrastructureManagerClaudiaImpl.java