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

Conflicts:
	some ache.txt
Merge branch 'Marina1107' of https://github.com/stemsc/status-m.git into Marina1107

Conflicts:
	some ache.txt
Signed-off-by: Vlad <sizov.vladislav@stemsc.com>