completed refactoring of search
Added a container for activty show page
Adjusted the front page margins as well
deleted:    app/assets/images/Fly_Boarding-0.jpg
new file:   app/assets/images/Fly_Boarding-2.jpg
modified:   app/assets/stylesheets/list.scss
modified:   app/assets/stylesheets/nav.scss
modified:   app/assets/stylesheets/variables.scss
modified:   app/views/activities/show.html.erb
Merge branch 'master' of https://github.com/thomasstephane/SYNthesis

Conflicts:
	app/views/activities/show.html.erb
Added sorting on category list
made clear cache recursive to handle slug folders
Corrected the conflict between slug and post request for maps
modified:   config/routes.rb

Updated the design of the front page
new file:   app/assets/images/orange-back-fade.png
modified:   app/assets/images/orange-back.psd
modified:   app/assets/stylesheets/list.scss
modified:   app/assets/stylesheets/main.scss
modified:   app/assets/stylesheets/search.scss
modified:   app/assets/stylesheets/variables.scss
modified:   app/views/activities/show.html.erb
Merge branch 'design'
Added favicon
modified:   public/favicon.ico
weather pulls dynamic icons depending on what weather for that location is
fade in weather
Modified gem for heroku
Bundle to update gemlock
Merge branch 'master' of https://github.com/thomasstephane/SYNthesis into design
Updated search method
Merge branch 'design'
Added front page title reorganization
Added location and title
modified:   app/assets/stylesheets/list.scss
modified:   app/models/activity.rb
modified:   app/views/activities/_activities_sorted_list.html.erb
modified:   lib/tasks/sfgate.rake
Merge branch 'master' into design
schema auto update
fixed merge conflicts