d
Merge branch 'master' of github.com:youngjoo0902/live

Conflicts:
	pub/js/common.js
a
Merge branch 'master' of github.com:youngjoo0902/live
Merge branch 'master' of github.com:youngjoo0902/live
추가 및 수정