Merge pull request #2 from arminakvn/design

At their studio now. Getting Armin's latest to set up on O,U computers.
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
Fix ou
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
before merging with mapc develop
Fix index view
Merge branch 'develop' of https://github.com/MAPC/equitabletod into develop

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/station_areas/show.rabl
fixing the gem conflicts