Added the category title on top
modified:   app/assets/stylesheets/list.scss
modified:   app/views/activities/index.html.erb
modified:   app/views/activities/show.html.erb
modified:   app/views/categories/show.html.erb
modified:   app/views/layouts/_nav.html.erb
Added some more organization in the activity layout
modified:   app/assets/stylesheets/list.scss
modified:   app/views/activities/index.html.erb
modified:   app/views/activities/show.html.erb
modified:   app/views/layouts/_nav.html.erb
Fixed search problem when no search field used
modified:   app/helpers/query_helper.rb
Corrected blank case, empty array, array of nil, of blank

Added a custom method on the model to display the time nicely
modified:   app/helpers/query_helper.rb
modified:   app/models/activity.rb
modified:   app/views/activities/show.html.erb
Added format to display date nicely
modified:   app/models/activity.rb
modified:   app/views/activities/show.html.erb

Added stronger font-weight for And Or on the front page
modified:   app/assets/stylesheets/search.scss
Fixed exception if no date
modified:   app/models/activity.rb
modified:   app/views/activities/results.html.erb
Corrected test to take into account the removed number of clicks on the main page
Merge local master and local design
Removed cache to test
deleted:    public/index.html