Added additional check on the file path in FileUpload
Added support for PowerPoint files
Updated changelog
Fixed sniffer params when using a custom resultserver ip for each vm (Closes #360)
Merge branch 'master' of https://github.com/cuckoobox/cuckoo
Merge branch 'master' of https://github.com/cuckoobox/cuckoo

Conflicts:
	modules/auxiliary/sniffer.py

Fix same problem with per-machine resultserver port as with IP