borrados .java autogenerados por idlj
Merge branch 'master' of https://github.com/ssoto/PCD-1314

Conflicts:
	eclipse-workspace/Corba-HelloWorld/interfaces/HelloApp/Hello.java
	eclipse-workspace/Corba-HelloWorld/interfaces/HelloApp/HelloHelper.java
	eclipse-workspace/Corba-HelloWorld/interfaces/HelloApp/HelloHolder.java
	eclipse-workspace/Corba-HelloWorld/interfaces/HelloApp/HelloOperations.java
	eclipse-workspace/Corba-HelloWorld/interfaces/HelloApp/HelloPOA.java
	eclipse-workspace/Corba-HelloWorld/interfaces/HelloApp/_HelloStub.java
Solventado conflicto