Fixed merge
Fix gadcam's notes

 - Fix https://github.com/ElbertF/Wappalyzer/pull/575#discussion_r13296124
 - Fix https://github.com/ElbertF/Wappalyzer/pull/575#discussion_r13296335
Fix gadcam's notes (#2)

 - Fix https://github.com/ElbertF/Wappalyzer/pull/575#discussion_r13295984
Add second HTML (src) attribute for Glyphicons

@gadcam Do you approve?

For https://github.com/ElbertF/Wappalyzer/pull/575#discussion_r13298147
Remove $ add end of TiddlyWiki copyright metadata

For https://github.com/ElbertF/Wappalyzer/pull/575#commitcomment-6526445