bundlelink와 favlink 연결하기
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	db/schema.rb
Favlink 모델에 after_create 콜백 추가함.
Merge remote-tracking branch 'upstream/master' into develop
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	Dockerfile
Merge pull request #34 from hschoidr/master

bundlelink와 favlink 연결하기