sd card and vga
merge 1

Conflicts:
	EatUBC/AndroidManifest.xml
	EatUBC/project.properties
	EatUBC/res/values/strings.xml
	EatUBC/src/com/jminions/eatubc/MainActivity.java
	EatUBC/src/com/jminions/eatubc/Tab3.java
	EatUBC/src/com/jminions/eatubc/TabsInitActivity.java
merge 2