changes for conflict solve2
Merge remote-tracking branch 'origin/master'
Merge pull request #65 from raviosc/developer125

Developer125