gapush 수정
Merge branch 'seo-hotfix'

Conflicts:
	app/scripts/app.js