Merge branch 'master' of github.com:MPBAUnofficial/transafealp
Merge branch 'master' of github.com:MPBAUnofficial/transafealp
Actiongraph connected to django endpoint
Merge branch 'master' of github.com:MPBAUnofficial/transafealp

Conflicts:
	jites/urls.py
	jites/views.py
	scenario/utility.py