added a timestamp to the json file so that it is always requested
Merge branch 'no-cache-local-data' into dev
Merge branch 'dev'
build the webapp