Fixing settings activity/fragment to no longer use deprecated code.  Also added the second activity to AndroidMainfest so it would stop crashing.