Backup files timestamped, backup folder ignored; Database dump built but not run on every change of file (watch)
Merge branch 'dev' of https://github.com/IMA-WorldHealth/Kapok into dev

Conflicts:
	Gruntfile.js