Merge branch 'master' of github.com:MPBAUnofficial/transafealp

Conflicts:
	jites/views.py
Merge branch 'master' of github.com:MPBAUnofficial/transafealp