Restored ability to return style modifications for channels which are returned by the datastore, restored hack which marks 'Zeo', 'Fitbit', or 'Flickr' channels as time_type local, and temporarily undid Yiru's changes to executeDataStore since those changes impose a dependency on java 7.
Merge branch 'development' of https://github.com/fluxtream/fluxtream-app into upstream_development