modify positions of query result button and panel
Parse real data into charts
Merge branch 'workingMap' of https://github.com/polaris-nus/dora into workingMap

Conflicts:
	dora/static/js/controllers.js
	dora/templates/main.html
Merge branch 'workingMap' of https://github.com/polaris-nus/dora into workingMap

Conflicts:
	dora/static/js/controllers.js
	dora/templates/main.html