Merge pull request #14 from ridwannaruto/Ridwan

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

Ridwan
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