Fixed Filter rotation and resolved conflict
Merge remote-tracking branch 'origin/master'
Added Achievements and colored filter texture