Readd scatter plot as directive
Add map using leaflet directive
Merge pull request #16 from flibbertigibbet/feature/add-map

Feature/add map
Readd barchart directive
Delete migrated MOS js files
Merge branch 'develop' of github.com:azavea/mos-energy-benchmark into develop

Conflicts:
	app/index.html
	bower.json
Readd bubblechart as directive
Merge pull request #18 from CloudNiner/feature/bubblechart-directive

Readd bubblechart as directive
Set jshint latedef to nofunc
Readd static time-scatter-chart, no x/y axis controls
Refactor time-scatterchart as directive
Add info view
Fix karma tests
Merge pull request #20 from CloudNiner/feature/info-view

Feature/info view
Add detail page stub
Fix charts test after merge
Add compare prototype view
Add blank mos view scss files
Merge pull request #19 from CloudNiner/feature/timescatterplot-directive

Feature/timescatterplot directive
Merge pull request #21 from CloudNiner/feature/detail-view

Blank Detail and Compare views