Move buffer to client console project
Merge branch 'tomp2p-27-SNAPSHOT' into Android