writing tests, need to finish tomorrow
merge from master to branch
features and controller tests for session all pass
fixed conflicts and merged