text  2 speach
text  2 speach
android wrapper
Merge branch 'master' of github.com:cyhex/blubber

Conflicts:
	app/app-war/src/main/webapp/html/store/index.html
	app/app-war/src/main/webapp/js/store.js