Changes in achievement icon naming convention
Merge remote-tracking branch 'origin/master'
more naming conventions and added description box