Added PDI
Merge branch '5.1-TRUNK' of https://github.com/wmarinho/docker-pentaho into 5.1-TRUNK
Added kettle
Update Dockerfile
Update Dockerfile
Update Dockerfile
.
Merge branch '5.1-TRUNK' of https://github.com/wmarinho/docker-pentaho into 5.1-TRUNK

Conflicts:
	data-integration/Dockerfile
kettle
Update Dockerrun.aws.json
Update Dockerfile
Update Dockerfile
Update Dockerfile
Last update
Merge branch '5.1-TRUNK' of https://github.com/wmarinho/docker-pentaho into 5.1-TRUNK

Conflicts:
	data-integration/Dockerfile
Merge branch '5.1-TRUNK'

Conflicts:
	Dockerfile
	cloud/aws/beanstalk/Dockerrun.aws.json