style new_location template
Merge branch 'sb-04-12b'
"Merge w styling branch"