Fixed indentation
added description to first 30 categories
merge edits
WIP
added dalli and memcachier gems to gem file and updated config file to allow memcache in dalli_store
fixed merge
removed will_paginate gem
changed to create/ gem file and schema auto edit
wip
caching front page results
updated schema version
pulled from master
added dalli and memcachier gems to gem file and updated config file to allow memcache in dalli_store
fixed conflict - slub moved to lib
added caching to front page
fixed missing 'end' in activity model
caching is working for front page
More design:

Background, alignmenet of the form, images and some normalization
new file:   app/assets/images/arrow.png
new file:   app/assets/images/back-test3.jpg
new file:   app/assets/images/background.jpg
modified:   app/assets/stylesheets/application.css
modified:   app/assets/stylesheets/main.scss
modified:   app/assets/stylesheets/nav.scss
modified:   app/assets/stylesheets/search.scss
modified:   app/assets/stylesheets/variables.scss
modified:   app/views/activities/_search_form.html.erb
modified:   app/views/activities/_when_search.html.erb
Merge branch 'design'
from master pull