TODO
Merge branch 'master' of https://github.com/dgomes/MELGA

Conflicts:
	xively/xively.c
upnpc strip