Merge branches 'master' and 'beta'
Merge branches 'master' and 'beta'
remove public/assets
Merge branches 'master' and 'beta'
Merge branches 'beta' and 'master' into beta