Added member functionality to the portal.
Started work on notifications
Started working on messaging functionality.
Removed merge conflicts and started work on messaging feature.
Merge pull request #16 from jdpagley/master

Removed merge conflicts and started work on messaging feature.