Updated ChallengeActivity and adjusted AlarmActivity

ChallengeActivity now gets bundled a ChallengeType and gets a
Challenge instance using factory