Merge branch 'develop' of github.com:MPBAUnofficial/transafealp
Merge branch 'master' of github.com:MPBAUnofficial/transafealp
start event views, class based view on main view, bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	scenario/urls.py
start event views, class based view on main view, bug fix
Merge branch 'master' of github.com:MPBAUnofficial/transafealp into feature/startEvent
add url to jites start event, change the search events url and template
bug in template
bug in template
start event
Merge branch 'master' of github.com:MPBAUnofficial/transafealp into feature/startEvent

Conflicts:
	jites/urls.py
	jites/views.py
Integration "scenario search" with "select event location"
initial work on start event function
Merge branch 'master' of github.com:MPBAUnofficial/transafealp

initial work on start event function
Basic confirm event handler
Merge branch 'master' of github.com:MPBAUnofficial/transafealp into feature/startEvent
Merge branch 'feature/startEvent' into develop