role
Timetable form done
Merge pull request #3 from ridwannaruto/dewmal

Foss Bundle Added
registration profile profile edit
Merge origin/master into dewmal
Merge pull request #4 from ridwannaruto/dewmal

Profile Edit
Merge pull request #5 from ridwannaruto/Shenal

Timetable form done
Renew Journey Form
Merge pull request #6 from ridwannaruto/Ridwan

Renew Journey Form
addmember
Merge origin/master into dewmal
Merge pull request #7 from ridwannaruto/dewmal

Add Member
Renew Login/Profile
Merge pull request #8 from ridwannaruto/Ridwan

Renew Login/Profile
add driver add assistant
Merge origin/master into dewmal

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

Fixed the bugs
Timetable updated
Merge origin/master into Shenal
Renew Login/Profile