Merge pull request #1 from PSUCapstoneA/master

pull request to update
fixed newline chatMessage issue
Merge branch 'master' of https://github.com/jefffung/firefox-im
get latest code with settings
fixed newline not showing in chat bug, fixed text box staying populated between views bug, added capability to edit user info
Merge pull request #85 from jefffung/master

bug fixes, and capability to edit user info by jeff
merge