Beta Release for Client Demo
Merge branch 'master' of https://github.com/jimmux/voicelabs

Conflicts:
	apps/vst/res/layout/feed_game.xml
	apps/vst/src/edu/voicelabs/vst/ChooseGameActivity.java