Merge branch 'master' of https://github.com/honeynet/beeswarm

Conflicts:
	requirements.txt