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
Merge pull request #144 from rpandey1234/improveMain

Improve main activity- layout and ability to enlarge images
Merge pull request #145 from elihart/moreFilters

More filter work
Created company class to house all json data for each company
Merge pull request #157 from elihart/companyClass

Created company class to house all json data for each company
add fb profile pic to personal view
fix layout issue
use popular ads layout for corresponding activity
code clean, remove content view setting