수정사항 적용
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/_include/footer.php