Updated Code for DeLocker Merge

Merge still requires settings page, NSManaged Object Subclass of
LockerAccount Model (called Categories), and overall flow control check