Merge pull request #92 from jefffung/master

User View Bug Fix
Merge pull request #93 from jefffung/master

added HTML sanitizing when inserting username info to database
fixing contact
Merge branch 'master' of https://github.com/PSUCapstoneA/firefox-im
fixed Brian's sprint 5 bugs
Merge pull request #94 from liubrian/master

Brian's Sprint 5, bugs fixed.
fixed bug where user info cannot be edited in other fields if username stayed the same