adding location output with fade in transition
Merge remote-tracking branch 'origin/master'