Conversions nearly done, lots of small changes in feeds and speeds.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/conversion_item_detail.xml
Conversions nearly done, lots of small changes in feeds and speeds.