Join 관련 소스 개선
Merge branch 'master' of https://github.com/rockgis/MyHair.git

Conflicts:
	MyHair/src/main/java/com/uiscloud/myhair/controller/LoginController.java
	MyHair/src/test/java/com/uiscloud/test/service/PersonServiceTest.java
	MyHair/src/test/resources/spring-context.xml