셋팅관련 재정비.
머징.

Merge branch 'master' of https://github.com/fastcatsearch/analytics

Conflicts:
	analytics-server/src/main/java/org/fastcatsearch/analytics/http/action/service/keyword/GetServicePopularKeywordAction.java