working on the achievement list activity
Merge remote-tracking branch 'origin/master'