Merge branch 'master' into 1.2
Improved achievements
Merge branch '1.2'
Updated android version