Css troubles that will need to be solved another way but...
Merge branch 'master' of heroku.com:topekacb-test

Conflicts:
	public/assets/css/site.css
Merge branch 'master' of http://github.com/nxidis/topekacb
connect-mongodb for session storage in mongo

run 'npm install' to get node package
layout changes - adopter search on matching screen
Facebook settings updated for test and prod instances
Matching changes, fix gender enum in adoptee detail page
Adoptee matching layout changes
System - Session state must be externalized #50

Setup rolling session. Set cookie max age to 60 minutes and check for
expired session every 10 minutes
Changing from connect-mongodb to connect-mongo to use existing mongoose connection
Another change for session store - hopefully final

connect-mongo doesn't support replicaSet. Changing to connect-mongostore
which supports replicaSet
Issue #52 - Styling issue fix

Added scss compile for font-awesome.css in grunt
Could not reproduce "Save Changes" issue
SSL #64 - Added code to check for node environment and x-forwarded-proto header

Based on forwarded headers by heroku in
https://devcenter.heroku.com/articles/http-routing
Adoptee match work in progress
Adoptee matching work in progress
Merge branch 'master' of http://github.com/nxidis/topekacb
Adoptee matching work in progress
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/app/matching/directives/adopterSearch/adopterSearch.js
	public/app/matching/match.jade
	public/app/matching/mvMatchCtrl.js
	public/assets/css/bootstrap-overrides.scss
	public/assets/css/site.scss
	server/includes/layout.jade