api change fix
Merge branch 'TStr' of https://github.com/lstopar/qminer into TStr
api fix
Merge branch 'TStr' of https://github.com/lstopar/qminer into TStr

Conflicts:
	src/glib/base/http.cpp
	src/glib/base/url.cpp
Merge branch 'TStr' of https://github.com/rupnikj/qminer into TStr
...