Merge remote-tracking branch 'upstream/development' into development
merge upstream to local
Merge remote-tracking branch 'upstream/development' into development
remove one static var and fix an bug
Merge remote-tracking branch 'upstream/development' into development
Merge remote-tracking branch 'upstream/development' into development
check whether vocabulary is null
Merge pull request #43 from areshand/development

Merging Bo's changes