Merge pull request #6 from BlueText/master

Andy's request merge for sending history
Notification clean up
Merge pull request #3 from Hartman2/master

Andrew Shit
Merge pull request #4 from Hartman2/master

Login = login method makes me contact
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
New Contact bug and remove notification codeg
Don't allow users to enter new contacts with duplicate phones
Conversation pane tabs changed from static and correctly update the font
now
minor modifications
me contact is now from database
.equals
import clean up
Merge pull request #42 from travisreed-wf/master

Minor Bugfix to Contact Search
Login when enter key pressed
Merge pull request #1 from BlueText/master

title
allow contacts to have spaces in their name
add default button to edit page
Javadocs