Merge branch 'master' into develop
[Sprint 53] plugin analytics
[Sprint 53] plugin analytics
[Sprint 53] register user with type offer
[Sprint 53] icon android
Merge branch 'develop'