Add daily deduction and daily rating.
Removed debug info
conflict_version
conflict_version
conflict_version
Merge branch 'lexin13-master'