Merge branch 'building'

Conflicts:
advoc.css