some merge.
Merge branch 'master' of https://github.com/strikerz76/Yashrukor_2