change main layout
progress
Merge branch 'develop'
div id="d-station" style="margin:0;"></div>

Conflicts:
	index.html
	js/displayData.js