Added persistant Favorites
Merged the new Settings and Favorites activities commits