BugFix
Merge branch 'master' of https://github.com/csmanioto/pentaho

Conflicts:
	Dooker/BIServer.dockfile