Added new table for search engine
new file:   db/migrate/20130616190658_words.rb
Created method to organize seacrh words by type of search
modified:   app/helpers/populate_search_helper.rb
Added model for words, added country in the search result
modified:   app/helpers/populate_search_helper.rb
new file:   app/models/word.rb
created seed file for countries
Merge branch 'words' of https://github.com/thomasstephane/SYNthesis into words
Added methods to query the DB per search field
added model for regions, modified activity model to have a region id, added seed file for regions, added seed file for words for regions, changed factory file to account for regions
added validation to ensure words for word database are not duplicated
Updated
Added validation to model activity
modified:   app/models/activity.rb

Updated the populate method to include cost and dates
modified:   app/assets/javascripts/populate.js

Created word model
new file:   app/models/word.rb

Removed nested link
modified:   app/views/activities/_activities_sorted_list.html.erb

Search engine adjustments
modified:   app/controllers/activities_controller.rb
modified:   app/helpers/populate_search_helper.rb
Merge branch 'words' into betterdata

Conflicts:
	app/helpers/populate_search_helper.rb
	app/models/word.rb
Fixed typos in activity.rb
modified:   app/models/activity.rb
Merge branch 'words' of https://github.com/thomasstephane/randompractice into words
Updated model and search engine to take into account the city case (not a sperate table for now)
modified:   app/helpers/populate_search_helper.rb
new file:   app/models/region.rb
modified:   app/models/word.rb
Modified search engine to remove words if not matching
modified:   app/assets/javascripts/populate.js
modified:   app/helpers/populate_search_helper.rb
added regions model, region assoc, region seed, updated region relations in other rake tasks and seed files, and ensured all tests are passing
removed unnecessary lines
Adjust search population to add city interpretations
modified:   app/controllers/activities_controller.rb
modified:   app/helpers/populate_search_helper.rb
modified:   app/helpers/query_helper.rb
no bugs!
Merge branch 'words' of https://github.com/thomasstephane/randompractice into words