Merge branch 'deployment-code'
implemented upload code + publishing for master page / assets etc.
Merge branch 'master' into deployment-code