Merge pull request #1 from citizenme/tos-test

Merge in changed services from Tos test
Removed all HTML tags in content