updated beta
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.history/28/60adda54486c00141bd5801bc0a7c10d
	.metadata/.plugins/org.eclipse.core.resources/.history/2f/10f6784f486c00141bd5801bc0a7c10d
	Vid-It/bin/classes/com/example/vid_it/MainActivity.class
	Vid-It/bin/classes/com/example/vid_it/R$layout.class
	Vid-It/bin/classes/com/example/vid_it/R$menu.class
	Vid-It/bin/classes/com/example/vid_it/RegisterActivity.class
	Vid-It/bin/classes/com/example/vid_it/TOSActivity.class
	Vid-It/res/layout/footer_repeat.xml
	Vid-It/res/layout/register.xml
	bin/classes/com/example/vid_it/R$id.class
	bin/classes/com/example/vid_it/R$string.class
	bin/classes/com/example/vid_it/R$style.class
	bin/dexedLibs/android-support-v4-c5db3ee32af817cfe3026d4688a4ab75.jar
	gen/com/example/vid_it/R.java