Merge branch 'pippijn-master'
Partially fix javadoc generation errors

Add missing classes to CMakeLists.txt. Currently protobuf generation
happens after javadoc generation, so protobuf classes are undocumented
Merge branch 'pippijn-master'
Add more tests; fix return type of send_message/action.