Rename lists
Code refactoring to enable renaming lists
Basic layout for Settings Activity
Merge remote-tracking branch 'origin/master'