Merge branch 'dev'

Add expires rule so browsers will refresh css files whenever they are
modified