Merge pull request #1 from williecheong/staging

Merging into production.
Merge pull request #2 from williecheong/staging

Tossing in the Qb library
Merge branch 'master' into staging