Added UserProfileInfo object to hide certain details from web client. Also removes "<EMPTY>" fields and replaces them with empty strings when sending to web client. Fixed jasmine tests so that all now pass.
Merge conflict resolved
Merge pull request #134 from alxdarksage/develop

Merging fixes