Merging 'merging_assets' branch to 'master'.
Deploying to gh-pages.