S05_devise install
20141211am
20141211am
CONFLICT marge
Merge branch 'mtanahashi-20141211am' into 20141211am
Merge branch '20141211am' of https://github.com/kazu-kawa/helpdesk_mgt into 20141211am
CONFLICT marge
Merge branch 'miho05-20141211am' into 20141211am
Merge branch '20141211am' of https://github.com/kazu-kawa/helpdesk_mgt into 20141211am