styles changed, achievments added
Merge branch 'origin/master'
styles fixed
Merge branch 'origin/master'