deviseadd
befor commit
para conflict
deviseadd
signoutadd
Merge branch '20141211am' of https://github.com/kazu-kawa/helpdesk_mgt into 20141211am
fix bug that user cant sign in again