Fix typo in nginx setting
Merge pull request #1696 from ssut/1.10

Fix typo in nginx setting
Merge pull request #1698 from zvuc/1.10

tinyMCE 플러그인에 CodeMirror 소스코드 하이라이터 플러그인 추가 + 새 관리자 스킨 밑작업
Merge pull request #2 from Needlworks/1.10

Pull changes from needlworks