i
Merge branch 'master' of https://github.com/navyon/citytalk

Conflicts:
	res/layout/previewtxt.xml