debug set to false
Merge remote-tracking branch 'upstream/master' into publishReady
Merge remote-tracking branch 'origin/master' into publishReady
Merge pull request #213 from rpandey1234/ActionBar

Sherlock action bar!
Merge remote-tracking branch 'upstream/master' into publishReady
Fix text scroller to display correctly
Fix scroller layout margins
Change style scroller to be hidden when there is no text. Fixed bug with string equals
Change logo in scroller to not be selected automatically
Get rid of outdated logo picker activity

It has been replaced by the logo scroller
Fix filteractivity to save result
Merge pull request #216 from elihart/textScroller

Text scroller
Fix login issue
Merge pull request #217 from elihart/filterFix

Whoops... filter result was never actually saved
Merge pull request #218 from benrudolph/login-fix

(#215) - Fix login issue
update version
Merge remote-tracking branch 'upstream/master' into publishReady
Real devise token auth
add caching
remove log tags