Merge pull request #2 from Waapps/DevBranch

merge devbranch in Predev
7.12 local commit

7.12 local commit
change to 7.30
Merge pull request #3 from Waapps/PreDev

Pre dev to Dev branch