messing with UI
Merge branch 'master' of https://github.com/azzogat/KT_mamba
done with UI
Merge branch 'master' of https://github.com/azzogat/KT_mamba
Merge branch 'master' of https://github.com/azzogat/KT_mamba

Conflicts:
	apps/ofTest/mySketch/src/testApp.cpp
adding shader files from petr
Merge branch 'master' of https://github.com/azzogat/KT_mamba
small fix in height feedback value