Reogranized project & deleted some cruft files
Use full filter
Merge branch 'master' into custom

Conflicts:
	src/CommentCoreLibrary.js
	src/filter/CommentFilter.js