Deleted fixme
Merge branch 'master' of https://github.com/tianwei1989/ffd-lblmaster-merge