합치기용
Merge branch 'master' of https://github.com/LikeTalk/liketalk

Conflicts:
	apps/templates/home.html
	apps/views.py