Todo update
Merge branch 'master' of https://github.com/hs-furtwangen/ColorQuest
Revert "Todo update"

This reverts commit f527cfe3ff4ce1afc93cfbd9ab7117ee37445644.
Revert "Revert "Todo update""

This reverts commit e651ef447f8acb96c767cf0d0e5bdba847672c8c.
Merge branch 'master' of https://github.com/hs-furtwangen/ColorQuest