add assembly; jetty config; start/stop script
add version and buildnumber feature;
improve start/stop script
add empty directory to application structure
add stackoverflow badge
new approach: add jetty distribution
Merge branch 'develop' into issue/24_jetty

* develop:
  sprintconfig
  introduction of federated networks
upgrade versions , servlet 3, jersey
include rpm plugin for rpm file creation
add unix-maven-plugin used to debian package
Merge branch 'develop' into issue/24_jetty

* develop: (29 commits)
  add configuration for org.apache.http logs; modify levels
  init db change
  modify path to rolling log files
  add rollingPolicy to logback; fix tests, because after last merge were broken; remove all System.out.println
  add appenders for installator with sdc, infrastructure (openstack operations)
  add sl4j facade; add logback to poms add exclussion for log4j and commons-loggin
  user data update for ohai
  user data change
  changes for introducing the user data
  fix bug: add vdc at the end of hostname in tierinstance add new method to generate the name modify unit test and integration test
  change the user data
  remove comments initdb
  remove comments in initdb
  inclusion of user data class, the get chef-server and the introduction in the json
  fix bug when admin token is invalid; the solution is create new token; add unit test;
  check the conflics in the merge
  spring
  changes to remove network in several regions if there is not federated functionality just a warn appears
  update teh tierdto
  Update README.md
  ...

Conflicts:
	README.md
	core/src/main/resources/log4j.properties
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
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
remove error JSP to create JSON. Now use ErrorHandler.
add ErrorHandler unit test;
add logback to jetty conf; remove log4j
add module logging
remove error JSP to create JSON. Now use ErrorHandler.
add ErrorHandler unit test;
add logback to jetty conf; remove log4j
add module logging
adding more test in model
Merge branch 'develop' of https://github.com/telefonicaid/fiware-paas into bug/notallremovedwhenfailure_47

Conflicts:
	model/src/main/java/com/telefonica/euro_iaas/paasmanager/model/Environment.java
	model/src/test/java/com/telefonica/euro_iaas/paasmanager/model/EnvironmentTest.java
	model/src/test/java/com/telefonica/euro_iaas/paasmanager/model/NetworkTest.java
increase test
upgrade jersey version to from 1.x to 2.x
add errorhandler and use APIException to create response JSON
use Autowired in resource layer
Merge branch 'develop' into issue/24_jetty

* develop:
  sprint model change
  update the scrip
  update the script
  migration inclusions
  inclusion of the range for federated network
  delete useless command
  add puppet-master dns
  change in order to obtain the cidr for the federated network
  add puppet to cloud init, getting url from keystone
  add unit tests
  check if the network exists in BD and in openstack. IN case it does not exist in opesntack, it is required to create it
from java 6 to java 7
Merge branch 'develop' into issue/24_jetty

* develop:
  add stackoverflow badge
  Update README.md

Conflicts:
	README.md