Merge branch 'master' of C:\CHACHA\00.DEV\00.BREWDUCK\00.WORKSPACE\brewduck with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/brewduck/web/api/controller/ApiController.java
14.07.07- 차준영 최신글 목록 작업