Merge branch 'origin/dev2' into origin/dev1
Merge pull request #1 from Vison2014/origin/dev1

Merge branch 'origin/dev2' into origin/dev1