add trip and stations model
add location logi to welcome controller
merge fix