Pulling dev
Commiting before pulling development
fixed merge conflicts
Remove ChatMessageSpec test that broke test suite
Slightly refactored FBmodule. Moved event handler to appropriate file
Resolved merge conflicts
Update branch
fixed session reset
merged in changes from post-code-review-test-coverage
merged from refactoring_ben_regan
fixed session tests