Sort order for signatures. Allows to write meta-signatures combining the results of base signatures to a specific detection
Loads signature data from a json db file. This reduces maintainance with very large signature sets
Start 1.1-dev
Fixed bug related to typo in virustotal Bundle reference generation in addAnalyses
Fixed typo in associated_argument_name for ControlService mapping
Merge branch 'signature_ordered' of git://github.com/Thorsten-Sick/cuckoo into Thorsten-Sick-signature_ordered

Conflicts:
	lib/cuckoo/core/plugins.py
Merge branch 'overlay_for_signatures' of git://github.com/Thorsten-Sick/cuckoo into Thorsten-Sick-overlay_for_signatures
Move the overlay code around a bit to a hopefully more appropriate location.
move json import to the right place, and remove dangling method calls
add debug message and example overlay file
Minor fixes
Start 1.1 in docs too
Added python-gridfs requirement (Refs: #237)
Merge pull request #233 from ikiril01/master

Fixes for a few bugs in MAEC40 Module and Mappings
Merge branch 'development' of https://github.com/cuckoobox/cuckoo into development
Merge branch 'development', remote-tracking branch 'upstream/development'