resolve conflict
add schedule finished
Merge branch 'feature/add_Schedule'

Conflicts:
	app/controllers/UbikeController.php
	app/routes.php
merge update ui