sources
Merge remote-track

Conflicts:
	repo/advancedsettings.xml
	repo/favourites.xml