mid progress on map stream
Merge branch 'master' of https://github.com/scobb/Impromptu

Conflicts:
	app/src/main/res/layout/fragment_stream.xml