Merge branch 'staging' of github.com:huerlisi/bookyt into staging
Merge branch 'staging' of github.com:huerlisi/bookyt into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Update CHANGELOG.