added localization string for lock screen
fixed a bug about wrong return type of logdb service method
fixed araqne/issue#805
Merge remote-tracking branch 'origin/master' into uidev-upload