Merge branch 'develop'

Merging 2 branches
Working version witch storing some data on Cloud