Changed log verbosity in development setting
Merge branch 'master' of github.com:CMU-SSN/SSN
Merge branch 'master' of github.com:CMU-SSN/SSN
Added VoIP extension column to user
Added VoIP extension to user profile page
Merge branch 'master' of github.com:CMU-SSN/SSN

I made modifications for VoIP and need to merge those for geolocations and timeline.