Style adjustment on the front page form
modified:   app/assets/javascripts/navigation.js
modified:   app/assets/stylesheets/search.scss
modified:   app/assets/stylesheets/variables.scss
Front page lists design, calendar design and unhide the form - for now
new file:   app/assets/images/square.jpg
modified:   app/assets/stylesheets/application.css
new file:   app/assets/stylesheets/list.scss
modified:   app/assets/stylesheets/main.scss
modified:   app/assets/stylesheets/search.scss
modified:   app/views/activities/_activities_sorted_list.html.erb
modified:   app/views/categories/_index.html.erb
Calendar test removed
modified:   app/views/categories/_index.html.erb
Merge branch 'design'
Deleted cache files
Cache update
Merge branch 'master' of https://github.com/thomasstephane/SYNthesis

Conflicts:
	public/index.html