Merge pull request #45 from ridwannaruto/newSabra

operator time managemnt started
Messages Improved
setting journey entry
Messages Improved
Messages Improved
add intermidiates ok but no java scripts
Revert "Messages Improved"

This reverts commit d79745df23f62591665fbb5c16517df8003a3a2b.
Merge origin/master into Dewmal-New

Conflicts:
	src/Busko/JourneyBundle/Resources/config/routing.yml
Messages Improved
Merge origin/master into Ridwan-new
Merge pull request #46 from ridwannaruto/Ridwan-new

Merged with Sabras Branch
branches
branches edit
branch bundle
edit added to branches & condition selection added to buses
Merge origin/master into Dewmal-New
pull again only difference is basic,html deleted
Merge pull request #47 from ridwannaruto/Dewmal-New

Dewmal new
basic.html.twig added
Merge branch 'master' of https://github.com/ridwannaruto/Busko.git into newSabra