Merge pull request #13 from ridwannaruto/Shenal

Changes to Routes
Employees Changed
Merge origin/master into Ridwan
Password Changed - Edited
Merge pull request #14 from ridwannaruto/Ridwan

Password Change Edited
Routes Edited
Routes Edited
test
Merge pull request #15 from ridwannaruto/Ridwan

Ridwan
Merge origin/master into Shenal
Timetable updated
operators add delete show
Merge origin/master into dewmal

Conflicts:
	src/Busko/JourneyBundle/Resources/config/routing.yml
Merge pull request #16 from ridwannaruto/dewmal

Dewmal created intermediates entity
Improved Employees
Merge pull request #17 from ridwannaruto/Ridwan

Improved Employees
not working employee
Merge origin/master into Shenal

New updates- Timetable

Conflicts:
	src/Busko/JourneyBundle/Resources/config/routing.yml
Merge origin/master into Shenal
bus add delete create edit