nodo 12/30 12:01
nodo
Merge branch 'master' of https://github.com/MinsuCracy/imgsearch.git

Conflicts:
	imgsearch/src/main/java/org/imgsearch/controller/ImgsearchController.java
	imgsearch/src/main/java/org/imgsearch/controller/LoginController.java
	imgsearch/src/main/java/org/imgsearch/mapper/UserMapper.java
	imgsearch/src/main/java/org/imgsearch/mapper/UserMapper.xml
	imgsearch/src/main/java/org/imgsearch/mapper/UserMapperImpl.java
	imgsearch/src/main/java/org/imgsearch/service/UserService.java
	imgsearch/src/main/webapp/WEB-INF/views/user/friInclude.jsp
	imgsearch/src/main/webapp/WEB-INF/views/user/location.jsp
	imgsearch/src/main/webapp/resources/js/geolocation2.js
nodo 12/30 12:31
nodo 12/30 14:08
nodo  12/30 15:11
test
aaa
aa
nodo 12/31 14:06
Merge branch 'master' of https://github.com/MinsuCracy/imgsearch.git

Conflicts:
	imgsearch/src/main/webapp/WEB-INF/views/img/menubutton.jsp
nodo 12/31 14:30
Merge branch 'master' of https://github.com/MinsuCracy/imgsearch.git
nodo