Merge pull request #143 from elihart/moreFilters

More filters
Added text labels to filter scroller
Merge branch 'master' of https://github.com/maplesyrup/maple-android into moreFilters
Changed color adjustment to use the filter library

Much cleaner then implementing it ourselves like before. Also changed
the settings to be brightness and contrast (instead of gamma).

Also fixed filters that weren't working