latest

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

Conflicts:
	out/production/CityTalk/com/example/CityTalk/ConfirmActivity$1.class
	out/production/CityTalk/com/example/CityTalk/ConfirmActivity.class
	out/production/CityTalk/com/example/CityTalk/Preview.class
	out/production/CityTalk/com/example/CityTalk/R$color.class
	out/production/CityTalk/com/example/CityTalk/R$drawable.class
	out/production/CityTalk/com/example/CityTalk/R$id.class
	out/production/CityTalk/com/example/CityTalk/R$layout.class
	out/production/CityTalk/com/example/CityTalk/R$string.class
	out/production/CityTalk/com/example/CityTalk/R$style.class
	out/production/CityTalk/com/example/CityTalk/R$xml.class
	out/production/CityTalk/com/example/CityTalk/R.class
	res/layout/confirm_screen.xml
	res/layout/previewtxt.xml