resolved TODO for enums...made Locators final class...changed one variable to final in UserModel...
Merge remote-tracking branch 'origin/master'