mirored adei version from bazaar (revision 465)

Signed-off-by: Nicholas Tan Jerome <nicholas.jerome@kit.edu>
Merge branch 'master' of https://github.com/kit-ipe/adei