Solving Database Problems
Merge remote-tracking branch 'origin/master'
Solving problems on route planner. Solved (thanks Lord).
Merge remote-tracking branch 'origin/master'
Solving merge errors.