不具合を修正
Merge branch 'master' of git@github.com:xperad/planet.git

Conflicts:
	src/main/webapp/WEB-INF/views/template/header.jsp