Moved out taxii_services, other modifications
Merge branch 'web-dev'