Merge branch 'master' of https://github.com/MikeSki3/TestAppWithYoutube

Conflicts:
	src/com/test/testappwithyoutube/MainActivity.java