merge and fix version
Merge branch 'volley' into dev
Merge branch 'single_filter' into dev
Merge branch 'permission_id' into dev
Merge branch 'rollout_bug_fixes' into dev
various unreported bug fixes
update actionbar pull to refresh
change "user" permission id back to 4
Merge branch 'dev'
release 2.6