Sprint 1 - Team AK

Merging develop branch into master for acceptance tests by AK PO. Merged additional gems too for tests.