pull
Merge branch 'master' of https://github.com/bdult/storyfarm

Conflicts:
	src/main/java/com/bgg/storyfarm/controller/ChildrenController.java
	src/main/java/com/bgg/storyfarm/service/UserService.java
	src/main/resources/query/userQuery.xml
	src/main/webapp/WEB-INF/views/children/play.jsp
	src/main/webapp/assets/css/board.css
	src/main/webapp/assets/css/common.css
	src/main/webapp/assets/css/layout.css
	src/main/webapp/assets/css/reset.css
	src/main/webapp/assets/js/Publish.js
	src/main/webapp/assets/js/unho.js