add intermidiates ok but no java scripts
Merge origin/master into Dewmal-New

Conflicts:
	src/Busko/JourneyBundle/Resources/config/routing.yml
Merge origin/master into Dewmal-New
pull again only difference is basic,html deleted
Merge pull request #47 from ridwannaruto/Dewmal-New

Dewmal new