latest version

testing animation not fixed yet, still has a delay
laest
Merge branch 'master' of https://github.com/navyon/citytalk

Conflicts:
	res/layout/confirm_screen.xml
	res/layout/previewtxt.xml