befor commit
para conflict
Merge branch '20141211am' of https://github.com/kazu-kawa/helpdesk_mgt into 20141211am
fix bug that user cant sign in again
Merge pull request #7 from sankai/20141211am

20141211am