Fixed user controller.
Added new conversation dataset.
Merge branch 'develop' of github.com:JayK31/tweet-conversation-viewer into develop
Merge branch 'conv' into develop