(/=) more reliable registration

-handle the case when IncomingFriendshipActivity is the first activity
to be launched.
(/=) Clean up MainActivity, FriendshipActivity