Merge branch 'master' into development
Enhance git addon todo list

Signed-off-by: Constantin Runge <uroc327@cssbook.de>
Merge branch 'development' into testing
Merge branch 'testing'