Add popup to indicate upload successful
Merge branch 'feature/site' into origin/Master-both