패키지 수정
Merge branch 'master' of https://github.com/fastcatsearch/techmanual

Conflicts:
	Techmanual/.target/controllers/Application.class