Startup: minor corrections
Manifest
Merge branch 'new_template_structure' of github.com:glastopf/conpot into new_template_structure
merged..
Further fixes to templates and parser.
Temporarily disabled XML parser (!!)