Logical Model Tabs
Tabs Code Added
Merge branch 'tabs'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/KKV.apk
	bin/classes.dex
	bin/classes/net/kkv/app/R$drawable.class
	bin/classes/net/kkv/app/R$id.class
	bin/classes/net/kkv/app/R$layout.class
	bin/classes/net/kkv/app/R$menu.class
	bin/classes/net/kkv/app/R$string.class
	bin/classes/net/kkv/app/R$style.class
	bin/classes/net/kkv/app/R$styleable.class
	bin/resources.ap_
	gen/net/kkv/app/R.java
	res/values/strings.xml
	src/net/kkv/app/MainActivity.java
	new file:   bin/res/crunch/drawable-hdpi/hoa_aina.9.png
	new file:   bin/res/crunch/drawable-hdpi/koa_aina.9.png
	new file:   bin/res/crunch/drawable-hdpi/lohe_aina.9.png
	new file:   bin/res/crunch/drawable-hdpi/mahi_aina.9.png
	new file:   res/drawable-hdpi/hoa_aina.9.png
	new file:   res/drawable-hdpi/koa_aina.9.png
	new file:   res/drawable-hdpi/lohe_aina.9.png
	new file:   res/drawable-hdpi/mahi_aina.9.png
	AndroidManifest.xml~
	bin/AndroidManifest.xml~
	src/net/kkv/app/MainActivity.java~