Video Stream and Timer update
Merge branch 'master' of https://github.com/jmeharq/AndroidVideoStream

Conflicts:
	.classpath
	AndroidManifest.xml
	gen/com/example/videostream/R.java
	res/layout/activity_main.xml
	src/com/example/videostream/MainActivity.java