added graph options
cleaned merge
Merge branch 'data-analysis'

Conflicts:
	application/controllers/place.php
	application/controllers/terrestrial.php
cleaned merge