Merge pull request #6 from BlueText/master

Andy's request merge for sending history
Notification clean up
getting rid oh history gather text
Merge pull request #16 from jdmielke/Conversation-Chat

Conversation chat merge with master
Merge pull request #17 from BlueText/master

Andrew's stuff last weekend
me contact is now from database
Merge pull request #18 from BlueText/master

Travis small merge
notification fixes
notification up to standards
added class for close buttons for convpanes
Andrew and Travis stuff
more merge ress
small stuff
Removing tabs now works
small fixes for merge
Merge pull request #46 from jdmielke/master

This will not support closing tabs yet but has fixes for conversations
resolve conflicts