decisionwizard created + criterions specified + models added
Merge branch 'master' of https://github.com/RiddleMan/journey-helper

Conflicts:
	app/index.html