name list 업로드
Merge branch 'master' of https://github.com/LikeTalk/liketalk

Conflicts:
	.gitignore
	apps/settings.py
	apps/templates/home.html