Signed-off-by: Vlad <sizov.vladislav@stemsc.com> Marina
Merge branch 'Marina1107' of https://github.com/stemsc/status-m.git

Conflicts:
	some ache.txt