Add test case for locker and betterlocker
Merge branch 'fanghui' of https://github.com/jcraley/deduplicator into fanghui

Conflicts:
	.DS_Store