merge
merge
로컬에서는 HSQL DB 사용하는 것으로
Merge branch 'master' of https://github.com/eungoo/eungoo.git

Conflicts:
	eungoo/src/main/resources/database.properties
	eungoo/src/main/webapp/WEB-INF/spring/root-context.xml