add test WikiContent
Merge branch 'hackathon' of github.com:yandod/candycane into hackathon
Merge pull request #179 from kaz29/cakephp-2.3.3

migration cakephp-2.3.3
reformat (PhpStorm)
Merge pull request #180 from hamaco/fix/reformat-controller

reformat (PhpStorm)
cakephp 2.1->2.2へのmigration時に必要な処理を追加