Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/pbe/upcstreamingservice/MainActivity.java
	app/src/main/java/pbe/upcstreamingservice/Multimedia.java
	app/src/main/res/layout/activity_multimedia.xml
Merge remote-tracking branch 'origin/master'