Merge pull request #198 from nhr/master

Organized site assets