1
Merge remote-tracking branch 'origin/master'

Conflicts:
	AppVideoStream/app/src/main/res/layout/fragment_login.xml
2
Merge remote-tracking branch 'origin/master'