Setting up editor enviroment
Merge branch 'dev/drupal' of https://github.com/JohnnyRuvac/The-Data-Matters into dev/drupal

Conflicts:
	src/sites/all/themes/datamatters_static/templates/page.tpl.php
Added map page support