Fixed userLocation zooming issue
Added localisation for tracking error alert
Added handling for user location tracking error
Merge branch 'development'