Merge branch 'master' into favorites-list-work
Updated Otheruser xml with string resources
Linked FavoritesActivity to OtherUser button
Merge branch 'favorites-list-work'
Merge branch 'master' of https://github.com/MFiesta/whatsyourstory