Merge pull request #1 from saarinen/master

Master to stg
Merge branch 'staging' of github.com:saarinen/overlay_publisher