settings cleaned
makefile
webapp: timestamp added
dateparser updated
Merge branch 'master' of github.com:jplusplus/broken-promises