D20140226
Merge branch 'master' of https://github.com/etsrepo/FlotDataExplorer