Fixed TEMPLATE_DIRS setting must be a tuple
Fixed missing check for procmem report section
Merge pull request #417 from tempestsecurity/master

Fixed TEMPLATE_DIRS setting must be a tuple
volatility doc fix
add instructions on how to upgrade cuckoo in the exception
indentation
Merge pull request #421 from SnakeByteIL/master

volatility doc fix
Added option to disable storing memory dump in mongo
Updated changelog
Merge branch 'master' of https://github.com/cuckoobox/cuckoo

Conflicts:
	conf/reporting.conf
	modules/reporting/mongodb.py