Merge branch 'master' of https://projects.cit-ec.uni-bielefeld.de/git/ipaaca

Conflicts:
	.gitignore

java/test/src/ipaaca/LocalIUTest.java

 package ipaaca;
 
 import static org.junit.Assert.*;
-import ipaaca.Ipaaca.IUPayloadUpdate;
+import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
 
 import org.junit.Before;
 import org.junit.Test;