made lots of changes before I could commit - going to branch and then
try to merge with last master
Merge branch 'dk_new_views'

Conflicts:
	apps/vst/src/edu/voicelabs/vst/TutorialActivity.java

	modified:   apps/vst/res/anim/anim_btn_red_circle1.xml
	modified:   apps/vst/res/anim/anim_btn_red_circle2.xml
	modified:   apps/vst/res/anim/anim_btn_red_circle3.xml
	modified:   apps/vst/res/anim/anim_btn_red_circle4.xml
	modified:   apps/vst/res/anim/anim_fade_in.xml
	modified:   apps/vst/res/anim/anim_play_btn.xml
	modified:   apps/vst/res/anim/anim_start_btn.xml
	modified:   apps/vst/res/anim/anim_txt_fade.xml
	modified:   apps/vst/res/anim/anim_txt_fade1.xml
	new file:   apps/vst/res/drawable-xhdpi/anim_leo_justblink0001_1.png
	new file:   apps/vst/res/drawable-xhdpi/img_obj_lettuce.png
	modified:   apps/vst/res/layout/feed_game.xml
	new file:   apps/vst/res/layout/phoneme_game.xml
	new file:   apps/vst/res/layout/syllable_game.xml
	modified:   apps/vst/res/layout/tutorial.xml
	new file:   apps/vst/res/layout/word_game.xml
	modified:   apps/vst/src/edu/voicelabs/vst/ChooseGameActivity.java
	modified:   apps/vst/src/edu/voicelabs/vst/LessonProgressActivity.java
	modified:   apps/vst/src/edu/voicelabs/vst/PhonemeGameActivity.java
	modified:   apps/vst/src/edu/voicelabs/vst/StartActivity.java
	modified:   apps/vst/src/edu/voicelabs/vst/SyllableGameActivity.java
	modified:   apps/vst/src/edu/voicelabs/vst/TutorialActivity.java
	modified:   apps/vst/src/edu/voicelabs/vst/WordGameActivity.java
cleaned up after merge and added some sound files to /assets