fixing imports
Fixing imports
Update applet.py
Accounting for possible weirdness in program locations
Fixing imports
Merge branch 'master' into mitre-enhancements

Conflicts:
	analyzer/windows/modules/packages/applet.py
	analyzer/windows/modules/packages/html.py
	analyzer/windows/modules/packages/ie.py
Fixing problems caused by 32 bit guest not recognizing ProgramFiles(x86) env variable
Update virtualbox.conf
Update virtualbox.conf
Fixing jar
Merge branch 'master' of https://github.com/robertsjw/cuckoo
Merge branch 'master' into mitre-enhancements
Merge pull request #10 from robertsjw/mitre-enhancements

Mitre enhancements