tag
test
Merge branch 'dev-2'

Conflicts:
	Metic/HttpSender.h