Merge pull request #1 from BlueText/master

Pulling Andrews stuff
Merge pull request #2 from BlueText/master

Travis' work
added user preferences to the .gitingore
Merge pull request #3 from BlueText/master

Andy
Latest changes by Jon

added in a text manager class and updated other classes for more general
use of quick chat.  Should be able to open chats for multiple contacts
now.
Merges with andrew's Stuff
Merge pull request #4 from BlueText/master

Andrew's changes may cause conflicts.
Quick chat now supports sending and receiving texts

-multiple chats can now be open and used at the same time
-all chats are opened with the quick chat option in task bar
-messages from non contacts may not work(needs testing)
Fix

bug fix when not auto signing in
Merge pull request #5 from BlueText/master

Travis' Merge
Small Fixes for Merge
Merge pull request #31 from jdmielke/master

QuickChat is in working order now