refactorings
Merge branch 'master' into tos-kamiya/refactoring
add personal log feature in goal page
resolve conflict
remove merge lines (<<<, >>>, ===)
Merge pull request #57 from ICTKyouikukei2013/tos-kamiya/personallog

Tos kamiya/personallog
fix hyoji bug
Merge pull request #58 from ICTKyouikukei2013/yamamoto/bugfix-goalpage

fix hyoji bug
Merge pull request #60 from ICTKyouikukei2013/Kosuke/layout

Kosuke/layout
add favicon.ico
conflict fix
fixed conflict
Merge pull request #63 from ICTKyouikukei2013/master

conflict fix