Fixed wrong options separator
Merge pull request #336 from upsidedwn/master

Fixed wrong options separator
Added a little bit of documentation
Added machine utility documentation
Common style for examples
Updated changelog
Fixed vulnerability in resultserver
Merge branch 'master' of https://github.com/cuckoobox/cuckoo