Fixed scrolling in messages
Merge branch 'master' into messages
Added viewing messages from circles
Added sending messages to circles
Fix bug which made conversations appear incorrectly
Merge branch 'Friends'
Users can now send messages on enter
Fix bug - sending empty messages
Merge branch messages
Fix merge bug in FriendsHelper
Added ability to view profile
Enable editing profile
Added auto-completing user search
Fixed ordering of table creation
Fixed populate tables order to work with FK
Created user view
Added cancel button
Added error messages
Merge branch 'profile'
Script to generate large DB tables
(and efficiency fix needed due to these larger tables!)