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

Conflicts:
	.idea/workspace.xml