Merge pull request #3 from Waapps/PreDev

Pre dev to Dev branch
Merge pull request #4 from Waapps/PreDev

7.45 local
Revert "7.45 local"
Merge pull request #5 from Waapps/revert-4-PreDev

Revert "7.45 local"
Merge pull request #6 from Waapps/DevBranch

Dev to predev