// new layout integrated into rails. seamless scaling enabled, script will be simplifyied. footer added. old svg files replaced.
Fixes: Change tab characters to spaces, delete extra file, remove some comments.
Merge branch 'develop' into feature/templates

Conflicts:
	app/controllers/pages_controller.rb
Fix new layout to work with asset compilation.
fixed bootstrap styling conflicts. extended menu helper for main nav items. used mixins for gradients.
Make an interactive map on the locations page.
New repository URL for deployment.
Sass is really having trouble when new files are added.
Upgrade rails to 4.0.2
Update the maps javascript to use custom styles and html template.
Return the enter new earth page to the accordion method.
Merge branch 'develop' into feature/cms

Conflicts:
	app/controllers/pages_controller.rb