blablabal

Signed-off-by: Dimitar Todorov <d.todorov@seeburger.com>
committing fix from Aand B to master

Signed-off-by: Dimitar Todorov <d.todorov@seeburger.com>
Merge branch 'topic/fixDandC'

Conflicts:
	TestGitProject/src/com/test/D.java

Signed-off-by: Dimitar Todorov <d.todorov@seeburger.com>