befor commit
para conflict
Merge branch '20141211am' of https://github.com/kazu-kawa/helpdesk_mgt into 20141211am
Merge pull request #6 from yamadashizuka/20141211am

問い合わせ画面の日本語化
fix bug that user cant sign in again
回答画面日本語化
Merge pull request #7 from sankai/20141211am

20141211am
fix bug that user cant sign in again
Merge pull request #8 from sankai/20141211am

fix bug that user cant sign in again
devise 用の辞書ファイルを追加。
Merge branch '20141211am' of https://github.com/kazu-kawa/helpdesk_mgt into 20141211am
日本語化作業中
一通り日本語化完了。