Removed sample page and added transfer of assets and components into dist on glup
Fixed merge conflict