Updates for particle filter to shader not working, and settings menu started
Merge remote-tracking branch 'upstream/master'