Merge branch 'develop' of https://github.com/TheConstructors/QwikStubs into search

Conflicts:
	app/models/event.rb
Merge branch 'develop' into search

Conflicts:
	app/models/event.rb
fixed search result view bug
cleaned up solution for search result view bug
adds solr/* files to the .gitignore
Merge branch 'develop' of github.com:TheConstructors/QwikStubs into search
Merge branch 'search' of https://github.com/TheConstructors/QwikStubs into search

Conflicts:
	app/models/event.rb
Merge branch 'search' of github.com:TheConstructors/QwikStubs into search
removing the solr files, I don't think they need to be tracked
adds sunspot_rails_tester gem so that sunspot works in the test env
adds sunspot/solr config info to readme
updates readme
Merge pull request #23 from TheConstructors/search

Search
grouping by rows
Merge branch 'develop' of github.com:TheConstructors/QwikStubs into develop

Conflicts:
	app/models/event.rb
fixed merge conflicts