Merge branch 'development' of https://github.com/cuckoobox/cuckoo into bugfix_in_add

Conflicts:
	utils/web.py
Adding per-VM sniffing interface as an optional configuration value in <machinemanager>.conf
Minor fix: adding strip() when reading conf option
Merge pull request #103 from pdelsante/per-vm-sniff-if

Adding per-VM sniffing interface option
Patch refactoring
Me, dumb
Adding support for a per-VM snapshot name instead of always using current snapshot
Better handling of vmware configuration files
Added option to set clock in virtual machine, fixes time in analysis vm using current time
Removed useless debug
Updated changelog
Typo fix
Merge pull request #100 from pdelsante/web-pagination

Adding pagination to web.py and api.py
Refectored patch
Added check for empty db
Removed not use browse.html and renamed the new one
Merge pull request #104 from pdelsante/per-vm-snapshot-name

Adding per-VM snapshot name
Fixed and refactored push request.
Updated changelog
Synced documentation with configuration files