Column Names from DataServices populate the selector panels.

Conflicts:
	AWS/app/js/controllers/indicatorPanelCtrl.js
	AWS/app/js/services/services.js
Column Names from DataServices populate the selector panels.

Conflicts:
	AWS/app/js/controllers/indicatorPanelCtrl.js
Including Stashed changes for reading columns from db.
Fixing clobbered changes
Fixing a Merge bug