fixed a really bad bug... bump to 2.6

(cherry picked from commit bda072580783474dcd45d8ccd6294ea37609a364)
Signed-off-by: Simon Weil <simon.weil@naturalint.com>
hotfix bug in btn

(cherry picked from commit 5d9555399c678dba6649c363abbdae96188831fd)
Signed-off-by: Simon Weil <simon.weil@naturalint.com>
another bug

(cherry picked from commit ccc82ebc46a688df319ea0d592af2daddc4ac42f)
Signed-off-by: Simon Weil <simon.weil@naturalint.com>
another bug 2

(cherry picked from commit 0e7c80a9b543341cd478c8ee7a1e418eba2b2a49)
Signed-off-by: Simon Weil <simon.weil@naturalint.com>
another bug 3

(cherry picked from commit db683e158a730283122cd0fcdc464fd545766d26)
Signed-off-by: Simon Weil <simon.weil@naturalint.com>
another bug 4

(cherry picked from commit 8352ab34cc9bd4d51a00af7ed31165706376931a)
Signed-off-by: Simon Weil <simon.weil@naturalint.com>
another bug 6

(cherry picked from commit bbe168d9154a70e3181d3d5c4b685b2478bafe0a)
Signed-off-by: Simon Weil <simon.weil@naturalint.com>
bug in c, what do we do???

(cherry picked from commit 5a6eb0ab89dbe8d992468bbf6dc1c9955fba0936)
Signed-off-by: Simon Weil <simon.weil@naturalint.com>
bug in btn now...

(cherry picked from commit e047c2ac1a2012545fcee028790a157fcb3242eb)
Signed-off-by: Simon Weil <simon.weil@naturalint.com>
take 1
take 2
Merge branch 'feature/add-feature-to-c' into develop