Merge pull request #2 from 3bot/master

Sync sources
no message
Merge branch 'master' of https://github.com/3bot/3bot into feature/3bot-viz-int

Conflicts:
	threebot/__init__.py
	threebot/urls.py
Merge branch 'feature/3bot-viz-int' into develop
Merge pull request #9 from philippeowagner/develop

Viz int