added provinces
change province to location in migration
Merge branch 'master' of https://github.com/mule-deer-2013/OpenNGO into schema_update

Conflicts:
	solr/pids/development/sunspot-solr-development.pid
Merge pull request #13 from mule-deer-2013/schema_update

Schema update
updated migrations (age, causes, activities)
added path for orgs/search
Merge pull request #15 from mule-deer-2013/schema_update

updated migrations (age, causes, activities)
Merge branch 'master' of https://github.com/mule-deer-2013/OpenNGO into search_path

Conflicts:
	config/routes.rb
transferred search to new route
Merge pull request #16 from mule-deer-2013/search_path

Search path
new people associations and query documentation
Merge pull request #17 from mule-deer-2013/create_people

new people associations and query documentation
merge conflict
merge conflict
Merge branch 'master' into view