* update to live api

Conflicts:

	resources/settings.xml