Streaming Screen Done
Merge branch 'master' of https://github.com/erikcaffrey/EmpredemeYo

Conflicts:
	app/src/main/res/values/colors.xml
StreamingScreen Done and Schedule Screen done  are wait End Points