temp
Merge branch 'master' of https://github.com/stormmax/TopicInsight

Conflicts:
	HacksDemo/HacksDemo/ChatViewController.m