Merge remote-tracking branch 'origin/master'

Conflicts:
	VideoPhone/res/layout/activity_main.xml