Merge branch 'dev' Conflicts: Malcom/model/model.py
Feature: Sniffer session persistence
Rebase comitted to master
Version 1.0 alpha