Add striping HTML tags from noteMessage in notepad. Add prevent files caching (bad for debuging, but good for testers)
Merge remote-tracking branch 'origin/dev-SOA-2' into dev-SOA-2