Merging from develop to Master

Merging stories that passed QA  from develop to Master