Merge pull request #2 from arminakvn/design

At their studio now. Getting Armin's latest to set up on O,U computers.
Add a liberal Cross-Origin access policy.
Working GeoJSON template for a single feature
Render proper GeoJSON
Whitelist all attributes
to be merged to develop
switching off of develop back to aadev
working on table
changes to many CSS files and a few others
Remove DS_Store
setting up the search args
newfiles
Merge from ou maybe
Merge branch 'design' into develop

Conflicts:
	.DS_Store
	app/.DS_Store
	app/assets/.DS_Store
	app/assets/javascripts/.DS_Store
	app/assets/javascripts/backbone/apps/main/main_app.js.coffee
	app/assets/stylesheets/.DS_Store
Fix ou
carousel working and page changes when clicking on Home on header
triggers added for firing up the user guid page still broken
before merging with mapc develop
carousel fix
deleted the ds store