added labels and images to activity page
Merge branch 'master' of https://github.com/iancheng/PunchQuest