Merge pull request #14 from Kinesis-P4/QA

This merge is already approved by the team!
Merge branch 'sprint2'
Merge pull request #25 from Kinesis-P4/QA

QA - Sprint 3
QA approved and ready to release to Sprint 3 and Master
Merge pull request #26 from Kinesis-P4/sprint3

Sprint3 - Mastering
This sprint is ok, ready to be live!
Merge pull request #30 from Kinesis-P4/sprint4

Sprint 4 release
Revert "Sprint 4 release"
Merge pull request #31 from Kinesis-P4/revert-30-sprint4

Revert "Sprint 4 release"
Merge pull request #33 from Kinesis-P4/QA

Merge pull request #32 from Kinesis-P4/sprint4
Merge