Merge branch 'Updates'
run compass and update sprite
Merge branch 'master' into Updates