Merge pull request #243 from unepwcmc/fat-theme-controller-refactor

Fat theme controller fixes
Start fixing missing primary and indicator data features
Theme index should only show indicators with data
Don't seed test, dummy!
Make ThemePresenter.populateIndicators support a filter clause

Conflicts:
	server/lib/presenters/theme.coffee
Stub Indicator.hasData to make test valid
Give esri type to indicators to make them appear on index
Add primary type to test indicators so that they pass primary filters
Remove DPSIR attributes as they are not applicable on this branch
Merge pull request #244 from unepwcmc/only-show-primary-and-data-indicators

Only show primary and data indicators
Merge branch 'master' into dpsir-support

* master:
  Remove DPSIR attributes as they are not applicable on this branch
  Add primary type to test indicators so that they pass primary filters
  Give esri type to indicators to make them appear on index
  Stub Indicator.hasData to make test valid
  Make ThemePresenter.populateIndicators support a filter clause
  Don't seed test, dummy!
  Theme index should only show indicators with data
  Start fixing missing primary and indicator data features

Conflicts:
	server/controllers/themes.coffee
	server/lib/presenters/theme.coffee
	server/test/controllers/theme.coffee
	server/test/units/presenters/theme.coffee
	server/test/units/theme.coffee