Added several challenges, adjusted challenge_details_layout.xml
Merge remote-tracking branch 'origin/master'
added more to dataManager in prep for presentation
added even more data to dataManager for presentation, other minor tweaks