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
changes to many CSS files and a few others
Add suggest. Add basic, verbose filtering to StationArea. Gem has_scope is not working
DS_Store to .gitignore
Remove DS_Store
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
Add fixtures, fix has_scope
Basic search, and a taste of advanced search. I still don't have all the data or attributes that will be in here, so there's not much I can do.
Merge changes from design