Added log in pages, continuing styling
Updated icons and styling for login page
Finished log in pages
Styled devise reset and recover password pages
Added mailer for devise reset and forgot password emails
Changed devise mailer settings
Merge branch 'homepage' into protected-area-design

* homepage:
  Basic styling for marker clusters
  Removes old data from home controller
  Include all JS, all the time
  Hooks up links for filtering on home page
  Allows filtering by marine
  Fix tests for search
  Correct OR filtering for search
  Refactors filter to accept multiple values for AND query
  Use ERB extension so that the config is parsed
  Removes hardcoded cdb tables for development
  Correctly render search results on map
  Use new maps on all pages
  Yet another JS refactor
  Only animate home page map
Fixed devise mailer
Added simple flash message to devise pages
Changed home page nav to green and aside to white
Added links to nav
Merge branch 'protected-area-design' of github.com:unepwcmc/ProtectedPlanet into protected-area-design

* 'protected-area-design' of github.com:unepwcmc/ProtectedPlanet:
  Added links to nav
  Changed home page nav to green and aside to white
  Added simple flash message to devise pages
  Fixed devise mailer
Merge branch 'protected-area-design' into search-filters

* protected-area-design:
  Added links to nav
  Changed home page nav to green and aside to white
  Added simple flash message to devise pages
  Fixed devise mailer
  Changed devise mailer settings
  Added mailer for devise reset and forgot password emails
  Styled devise reset and recover password pages
  Finished log in pages
  Updated icons and styling for login page
  Added log in pages, continuing styling

Conflicts:
	app/assets/stylesheets/base.css.scss
	app/views/layouts/application.html.erb