Fix map loading
Add startSpinner TGJS-event
Fix merge errors and minor stuff