updated .gitignore with upload folder
Merge branch 'master' into likev2
small adjustments to div refresh