Corrected missing end in helper
modified:   app/helpers/activities_helper.rb
modified:   app/helpers/search_helper.rb
Merge branch 'search' of https://github.com/thomasstephane/randompractice

Conflicts:
	app/helpers/activities_helper.rb
	app/helpers/search_helper.rb
Fixed weekend calculation formula to take into account if today is a weekend
modified:   app/controllers/activities_controller.rb
modified:   app/helpers/activities_helper.rb
modified:   app/helpers/time_helper.rb
modified:   app/views/activities/index.html.erb
Added weekend and today methods, rfactored activity model
modified:   app/helpers/time_helper.rb
modified:   app/models/activity.rb
deleted:    app/views/activities/shit.html.erb
Removed buggy gem better-errors
Added partial for sorted list
new file:   app/views/activities/_activities_sorted_list.html.erb
modified:   app/views/activities/_search_form.html.erb
modified:   app/views/activities/index.html.erb
modified:   app/views/activities/results.html.erb
modified:   app/views/categories/show.html.erb
Added sorting by visited links
modified:   app/helpers/activities_helper.rb
modified:   app/views/activities/_activities_sorted_list.html.erb
Added method to limit the number of post displayed
modified:   app/helpers/activities_helper.rb

Modified view accordingly
modified:   app/views/activities/_activities_sorted_list.html.erb
Change link to categories for weekend and today lists
modified:   app/helpers/activities_helper.rb
Adapted tests
Solved sorting issue. Now functionnal - all green
modified:   app/helpers/activities_helper.rb
modified:   app/views/activities/_activity_link.html.erb
modified:   spec/controllers/activities_spec.rb
modified:   spec/factories/factories.rb
Merge branch 'master' of https://github.com/thomasstephane/randompractice
Merge branch 'data_sorting'
Added case where phone text only, and internationalization
modified:   app/models/activity.rb
Merge branch 'master' of https://github.com/thomasstephane/randompractice