feed, popup

피드 콜리션 및 show 구현
팝업 초기 단
Merge branch 'master' of https://github.com/Daeik/Anima

Conflicts:
	resources/html/scripts/app.main.js