Deploy Current Dev Branch to QA

Here's a pull request ready to be accepted to move current Dev features to QA.