[Web UI] Changed colour of 'Run' button on plugin launcher page. Previous colour was not emphasized
[ptp] Bump version number.
[install] Fixed a bug in install. Fixed #332
[install] Disabled vuln database installation temporarily
[interface] Fixed #338
[install] Fixed #342
Botnet-mode no alive proxies bug fix
Fixed the python version. Fixed #346
[config] Bump version number.
[HTTP Sessions] Changed to pure JSON to keep consistency
[logging] Added colours to logging and added a seperate logging level for tool output
[tool] Fixed run_arachni script to accomodate the new versions
[interface] Improved the directory listing for our browse functionality
Merge branch 'lions_2014' into re-engineering

Conflicts:
	framework/core.py
	framework/db/resource_manager.py
	framework/shell/blocking_shell.py
	owtf.py