New broker

Change-Id: I0e828427eb0b389a3294032f4e5aa5f24739360c
Merge branch 'broker' of ssh://naan.mimuw.edu.pl:29418/nebulostore into broker

Conflicts:
	scripts/run-local-test.sh

Change-Id: I88f820b6defe848d0638ff7603a6d098cf0633a7