Merge pull request #40 from jdmielke/Conversation-Chat

Text history is pulled in and Notifications have been reworked
Merging in resolutions to merge
Taskbar = added in call when saved is on create the me contact

Conversation = worked on settings menu and default settings

login = Me contact made, property files are now not overwritten when
they are established already

SmallChat = default settings modifcation
Login = login method makes me contact
		sysout taken out
Merge pull request #41 from Hartman2/master

Andrew's December merge
Merge pull request #17 from BlueText/master

Andrew's stuff last weekend