added push/pull_view
123
Merge remote-tracking branch 'origin/branch2' into branch2

Conflicts:
	src/main/java/org/gnunet/ext/Brahms/BrahmsMessageHandler.java
	src/main/java/org/gnunet/ext/Brahms/BrahmsMessageReceiver.java
	src/main/java/org/gnunet/ext/Brahms/BrahmsPeerDisconnectHandler.java
	src/main/java/org/gnunet/ext/Brahms/BrahmsUpdate.java