Services

Added support for hping output
Kvasir is now able to merge nessus and nmap services
Bugfix: Importing an Nmap xml with OS details works now correctly
The reasoning is simple.This is because of the nessus output.
Nessus only guesses the services (and appends a ? at the end). nmap is more precisely.

line 57-58: Search in database if service already exists
line 61: if service exists, then:
line 62-65: if the current service (from nessus) is already in database, but has a different name, merge them ( nmap | nessus).
line 66-69: else: update or insert service
line 70-73 else (service not in db): insert service