merged
..
Merge branch 'master' of git@github.com:babting/igoServer.git

Conflicts:
	src/main/java/com/babting/igo/igoserver/controller/ApiController.java
	src/main/java/com/babting/igo/igoserver/dao/JdoDAO.java
	src/main/webapp/WEB-INF/jsp/index.jsp