Merge branch 'develop' of https://github.com/ihoneymon/rocking-the-rest-api into develop

Conflicts:
	build.gradle
* 변경사항
  * 수정: DatabasConfig
  * 이름변경:  config.xml -> application-config.xml
Merge branch 'master' of https://github.com/ihoneymon/rocking-the-rest-api