added method "testingMergeProblems"
again testing merge problems
Merge branch 'master' into pedja
added testingMergeProblems2
added testingMergeProblems3
added testingMergeProblems4