added qr marker joining / auto-generation. and streamlined the usage of the interface with the new qrmarkers
fixed the merge