updates to users/show
fixed failing spec in 'show.html.erb_spec'
Merge pull request #310 from tochman/fixes

UI updates
modified css class for 'agile-btn' with line-height'
modified devise/registrations/edit with css class for 'add-agile-btn' when displaying skills
Merge pull request #311 from tochman/fixes

Fixes for UI PR
extracted logic to separate module, renamed Page model to StaticPage, added Mercury Editing to StaticPage
add a requirement to set an environment variable for the notification emails
fixed up some ui details in users/show
Merge pull request #314 from yggie/notification-fixes

Update for Notifications
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into fixes
Merge pull request #315 from tochman/fixes

UI Fixes
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into static_pages