Making Unit tests happy again
json should be symlink
Merge branch 'master' of github.com:schubergphilis/Seccubus_v2

Conflicts:
	json