bug fix
bug fix
Merge remote-tracking branch 'upstream/master'

merging in new updates from parent theme bstocks/marina
put back in custom title